OSDN Git Service

am 666a30d5: am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:00:28 +0000 (13:00 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:00:28 +0000 (13:00 -0700)
commitcc9002b131f42bfe2a0ad4aaded32f538fc663b5
tree63f5fd378c80fc9f7c33353cc9b128617229bae8
parentab9dce32319a47cc102b3f489f457cdd0f62f304
parent666a30d575e0e279ded82c24b446b7dd4596136e
am 666a30d5: am 63cc80ff: (-s ours) am 1419f206: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '666a30d575e0e279ded82c24b446b7dd4596136e':