summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-16 05:48:14 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-16 05:48:14 -0700
commita9228942f0a6291e2721729ddf9a28f2318683e0 (patch)
treeb32b5983d58a170fcd74e2c808c565e7bed731de
parent2579dbcfcf4d1efb0231e9b545de19fc6350f406 (diff)
parent19ec15b247523ec8b0c6651e01bf746674d424d1 (diff)
downloadsystem_core-a9228942f0a6291e2721729ddf9a28f2318683e0.zip
system_core-a9228942f0a6291e2721729ddf9a28f2318683e0.tar.gz
system_core-a9228942f0a6291e2721729ddf9a28f2318683e0.tar.bz2
am 19ec15b2: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '19ec15b247523ec8b0c6651e01bf746674d424d1':
0 files changed, 0 insertions, 0 deletions