OSDN Git Service

am a6f7a22e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 16:22:36 +0000 (08:22 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Nov 2012 16:22:36 +0000 (08:22 -0800)
commit92e57e16f12a38f231dce32bb80e83dd13399160
tree36b366486002fa5fee1731c58be9125a4f5b7dc6
parentac0dce8c92f7001a906ebee19a773181373c0f61
parenta6f7a22e9902ce6e550ca0650caaecb69d963135
am a6f7a22e: (-s ours) Merge jb-mr1-dev into aosp/master - do not merge

* commit 'a6f7a22e9902ce6e550ca0650caaecb69d963135':