OSDN Git Service

am 463694a4: (-s ours) am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a792...
authorScott Main <smain@google.com>
Wed, 2 Feb 2011 05:00:05 +0000 (21:00 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Feb 2011 05:00:05 +0000 (21:00 -0800)
* commit '463694a4f54de3d16de21b7aa9a7030b73fbd2e5':
  cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb


Trivial merge