OSDN Git Service

am ca821336: am 53959634: am 40a7e3c4: am e71cc6fd: am 897739f1: Merge "Revert "add...
authorScott Main <smain@google.com>
Fri, 31 Jan 2014 08:18:05 +0000 (00:18 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 31 Jan 2014 08:18:05 +0000 (00:18 -0800)
* commit 'ca821336bdec3f1931f399e2a38e4171f92069a3':


Trivial merge