summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-11-06 12:31:26 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-06 12:31:26 -0800
commit783d625407becc7b754a4d7496b97ad5945d793c (patch)
treeacfc8b558580f0421840af5f9e94b328e18c1a90
parentf01e18bc0de016254c4ae6592f790724edb2b449 (diff)
parent4caf0ebebbdd7514f4c12ae14b4cc537d504f20e (diff)
downloadmms-783d625407becc7b754a4d7496b97ad5945d793c.tar.gz
am 4caf0ebe: (-s ours) am 188bd32c: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '4caf0ebebbdd7514f4c12ae14b4cc537d504f20e':
0 files changed, 0 insertions, 0 deletions