OSDN Git Service

am 5c19de4d: am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024e...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 20:49:20 +0000 (20:49 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 20:49:20 +0000 (20:49 +0000)
commitc1509400dcf79d65b2624e6fc6e7f667ff9edb29
tree797c4b3d81575250820a2bf59d97ad2086894eef
parent1e928f404f83da6ed29dc3d0b28f0a376b12d327
parent5c19de4d070dfaebde92a5df4e54c959eef95cba
am 5c19de4d: am 1d6e52d1: am 50d36d58: am 75bcd737: am 4ddcb758: (-s ours) am 9ef024ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '5c19de4d070dfaebde92a5df4e54c959eef95cba':