OSDN Git Service

am 17b0879f: (-s ours) Reconcile with jb-mr1.1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Nov 2012 15:46:35 +0000 (07:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 27 Nov 2012 15:46:35 +0000 (07:46 -0800)
commitbabe0faebe98ac4f87a7789976c958b80b797345
treea1aa103a3c6fa5a6aac05302ad40ac7548f9924f
parenta9c2d7764608fe8ba3fddf08c9abb6ae9813826d
parent17b0879f5c4ea61e49dd17756786d762dd603a72
am 17b0879f: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '17b0879f5c4ea61e49dd17756786d762dd603a72':