OSDN Git Service

am 81972daf: (-s ours) Reconcile with jb-mr2-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 17 May 2013 19:56:09 +0000 (12:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 17 May 2013 19:56:09 +0000 (12:56 -0700)
commit6d101328e34557fa251b7d52d4d8dbf59620d099
tree4b2f32a38c7fc8a9b335139206586d394acf9dfa
parentbd398c64c368615a810c9658798dbe8ec44978e8
parent81972daf3323a130ca06c9999a3a8530e33fece9
am 81972daf: (-s ours) Reconcile with jb-mr2-release - do not merge

* commit '81972daf3323a130ca06c9999a3a8530e33fece9':