OSDN Git Service

am e8201712: (-s ours) Cherry-Pick 3543c3 from master. do not merge.
authorSiva Velusamy <vsiva@google.com>
Thu, 29 Sep 2011 20:41:45 +0000 (13:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 29 Sep 2011 20:41:45 +0000 (13:41 -0700)
* commit 'e8201712bbfd6aaad00c36e41bfd93e7428f47db':
  Cherry-Pick 3543c3 from master. do not merge.


Trivial merge