OSDN Git Service

am d1c15f96: am 20f65201: am 0fbe1dfb: Merge "cherrypick from master: Change-Id:...
authorJoe Fernandez <joefernandez@google.com>
Sat, 9 Jul 2011 00:53:06 +0000 (17:53 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 9 Jul 2011 00:53:06 +0000 (17:53 -0700)
* commit 'd1c15f96dd2e3b07da6968ea54f6f2bdebe8e190':
  cherrypick from master: Change-Id: I169749dc594ca1d79a802db4c53ec330924fdd2c


Trivial merge