OSDN Git Service

am 2f09f14e: am 3245b90f: (-s ours) am 310db394: (-s ours) Merge "DO NOT MERGE: Do...
authorTenghui Zhu <ztenghui@google.com>
Mon, 5 Nov 2012 23:57:05 +0000 (15:57 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 5 Nov 2012 23:57:05 +0000 (15:57 -0800)
* commit '2f09f14ea0b9314fe3ad69a54866ddfa383c8c82':


Trivial merge