OSDN Git Service

am 81a8bb1c: am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypic...
authorXavier Ducrohet <xav@android.com>
Tue, 7 May 2013 23:13:25 +0000 (16:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 7 May 2013 23:13:25 +0000 (16:13 -0700)
commit72cc297cf26cb37847533b07e8914b97083478a7
tree65ff5204fe11776de68a52849383510ea72ce70c
parent5adeaeabd62481b529ec5999df481d74033d67f9
parent81a8bb1ca9df314faf6de09cc2da0a1db70c7391
am 81a8bb1c: am 0974061e: (-s ours) am 1181564f: am 42fb3abd: DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be

* commit '81a8bb1ca9df314faf6de09cc2da0a1db70c7391':
  DO NOT MERGE. cherrypick from I3653f67ee321eac37cb8a6d228b1ef6d104ff0be