OSDN Git Service

Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:45:17 +0000 (07:45 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Apr 2013 14:45:17 +0000 (07:45 -0700)
commit719842ffa78f9239fb737e909eb8dfe76cb8308b
tree2362b85b8d89e775c4af7bb1b120a7c26ec87170
parent37978d7c62d00880552eb5022acde6380862213d
parente3dba7294ec66f7ec50e8fa8c8d4c9c1f2521236
Reconcile with jb-mr2-release - do not merge

Change-Id: I6a6767350c2db72e397b4a7f39a1bf00db9560c0