OSDN Git Service

am 2c64b8c6: (-s ours) Cherrypick f37031 from master. do not merge.
authorTor Norbye <tnorbye@google.com>
Thu, 29 Sep 2011 21:37:05 +0000 (14:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Sep 2011 21:37:05 +0000 (14:37 -0700)
commit7340f1d81e35d221c47afd0bd0bbe656b9deae1e
treed7d39a38daf099e7d47a905fb8b9b7fa5a76c33e
parentb70f3e2d61d31b0871cc0b41923f435515dbf809
parent2c64b8c6855a1a4d512ca72abb6f16a9818da29c
am 2c64b8c6: (-s ours) Cherrypick f37031 from  do not merge.

* commit '2c64b8c6855a1a4d512ca72abb6f16a9818da29c':
  Cherrypick f37031 from master. do not merge.