OSDN Git Service

am 2cb0549a: Reconcile with jb-dev
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Oct 2012 22:17:32 +0000 (15:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Oct 2012 22:17:32 +0000 (15:17 -0700)
commit1bb422d4528c1156c4bf7535614888f0c2b5cd07
tree7b6e5b3c23d037ba88990e863bf188f9da772e87
parent2d17b1aba6ea529dc618d50c784f69fb7f1a8141
parent2cb0549a18232b262b5c01b86319cbc6fece252e
am 2cb0549a: Reconcile with jb-dev

* commit '2cb0549a18232b262b5c01b86319cbc6fece252e':