diff options
author | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-25 00:58:57 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-05-25 00:58:57 -0700 |
commit | 26a892a0459e18707bc56c6f92f9167120db349e (patch) | |
tree | bc11b857147e49139a953f56074eba2444ad997b /core/java/android/content | |
parent | 944ea123683b14225297d451c86e97fc73be3a02 (diff) | |
parent | c27d9b5341b29c1b58c882f0a04b4c519d8a9853 (diff) | |
download | frameworks_base-26a892a0459e18707bc56c6f92f9167120db349e.zip frameworks_base-26a892a0459e18707bc56c6f92f9167120db349e.tar.gz frameworks_base-26a892a0459e18707bc56c6f92f9167120db349e.tar.bz2 |
Merge change 2408 into donut
* changes:
Manual merge from cupcake_dcm. internal CL#148693. Two donottranslate.xml-s are already submitted.
Diffstat (limited to 'core/java/android/content')
0 files changed, 0 insertions, 0 deletions