OSDN Git Service

am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1...
authorJean-Baptiste Queru <jbq@google.com>
Mon, 11 Mar 2013 19:28:17 +0000 (12:28 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 11 Mar 2013 19:28:17 +0000 (12:28 -0700)
commit7915b22e8f70b80a9fc2c41f9734194c58b546fc
tree728220fb13ccd5c86fa57132ae49bf60a55c5152
parent940e4c9d9218ee183c8eb522beb9838c0482084b
parenta4b20d712b9c6cbc562529d3a41bf8ea1515562a
am a4b20d71: am b8e1033c: (-s ours) am e5412a9a: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a4b20d712b9c6cbc562529d3a41bf8ea1515562a':