summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2012-10-31 09:22:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-31 09:22:55 -0700
commitf01e18bc0de016254c4ae6592f790724edb2b449 (patch)
treeacfc8b558580f0421840af5f9e94b328e18c1a90
parentca863c08ce349739af1bf1fd5a13f988b93c6fca (diff)
parent20a08cc9916a2a65a557f533a6bdc2878b1bddef (diff)
downloadmms-f01e18bc0de016254c4ae6592f790724edb2b449.tar.gz
am 20a08cc9: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '20a08cc9916a2a65a557f533a6bdc2878b1bddef':
0 files changed, 0 insertions, 0 deletions