summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-15 07:42:56 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-15 07:42:56 -0700
commit3627b4af36717bf1cc3a85dd7a39f0721e023965 (patch)
tree7a6fcde317da44077cff3d763f6b2114549e34fa
parentd5c6a611066ef3bdc8f3729ea222338b3fc11390 (diff)
parent9155fe81a9844b78f90f340dad36c106768aae6b (diff)
downloadmms-3627b4af36717bf1cc3a85dd7a39f0721e023965.tar.gz
am 9155fe81: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '9155fe81a9844b78f90f340dad36c106768aae6b':
0 files changed, 0 insertions, 0 deletions