OSDN Git Service

am 1d0c7e05: am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:41:19 +0000 (12:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:41:19 +0000 (12:41 -0700)
commit0e9d232b670f14e70e68ff43bc7154d95a757e0a
treea15617143de70aabef74b4a09320a87181981985
parentaa54f436cdafec3594c93525339ca39c87c729d0
parent1d0c7e05d80ab18c1a859782313448dc6a31bab9
am 1d0c7e05: am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '1d0c7e05d80ab18c1a859782313448dc6a31bab9':