summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorBaligh Uddin <baligh@google.com>2013-05-28 20:47:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-28 20:47:19 -0700
commit09d85677c32b0c5c89bbeba4d4f08850d0b85a28 (patch)
tree5b77f27a7581c6bfc823f28fca13d7a933fe5c63 /core/java
parentb3db126dd494154745a1ebddf07add12edc89a18 (diff)
parente3425ac426fa5da15fa3d8471dd9c0e27cb52375 (diff)
downloadframeworks_base-09d85677c32b0c5c89bbeba4d4f08850d0b85a28.zip
frameworks_base-09d85677c32b0c5c89bbeba4d4f08850d0b85a28.tar.gz
frameworks_base-09d85677c32b0c5c89bbeba4d4f08850d0b85a28.tar.bz2
am e3425ac4: (-s ours) am af1e512e: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
* commit 'e3425ac426fa5da15fa3d8471dd9c0e27cb52375': Import translations. DO NOT MERGE
Diffstat (limited to 'core/java')
0 files changed, 0 insertions, 0 deletions