OSDN Git Service

keep history after reset to master again
authorThe Android Automerger <android-build@android.com>
Sat, 16 Feb 2013 18:10:52 +0000 (18:10 +0000)
committerThe Android Automerger <android-build@android.com>
Sat, 16 Feb 2013 18:10:52 +0000 (18:10 +0000)

Trivial merge