diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-10-27 21:32:02 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-10-27 21:32:02 +0100 |
| commit | 1391b24619d56bae6ce14bb54ed0fb16a945e853 (patch) | |
| tree | fbd465b79fe889aa53ee313b2a2b280b37a497d8 /grit | |
| parent | c77745f79a9f73c4e2d409f8ebc8b031fce6ca75 (diff) | |
| download | external_chromium-1391b24619d56bae6ce14bb54ed0fb16a945e853.zip external_chromium-1391b24619d56bae6ce14bb54ed0fb16a945e853.tar.gz external_chromium-1391b24619d56bae6ce14bb54ed0fb16a945e853.tar.bz2 | |
Final fixing of ANDROID guards
Verified that we now are in sync with chromium revision 61029
Change-Id: I49834ac6c0c422ab0d9a82caa02bdc63f456eadd
Diffstat (limited to 'grit')
| -rw-r--r-- | grit/net_resources.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/grit/net_resources.h b/grit/net_resources.h index 0e3156a..706ebcd 100644 --- a/grit/net_resources.h +++ b/grit/net_resources.h @@ -1,6 +1,6 @@ -// Copyright (c) Google Inc. 2010 -// All rights reserved. -// This file is automatically generated by GRIT. Do not edit. +// ANDROID TODO: +// This file has been hacked from a chromium generated file +// Can we solve this better? #pragma once |