OSDN Git Service

am 0e9d232b: am 1d0c7e05: am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd41...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:47:21 +0000 (19:47 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:47:21 +0000 (19:47 +0000)
commit09b4dc3d0a48af9bb5c2313baffc482bef7c041d
treea15617143de70aabef74b4a09320a87181981985
parent64a35290badfdd4537e12f74d63649624d780b9a
parent0e9d232b670f14e70e68ff43bc7154d95a757e0a
am 0e9d232b: am 1d0c7e05: am 6e5236ee: am 5c8f84a1: am 3a18bccc: (-s ours) am 431cd416: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '0e9d232b670f14e70e68ff43bc7154d95a757e0a':