OSDN Git Service

am b164425a: (-s ours) am d76bb175: am 4b69be27: (-s ours) am c816e061: Merge "(DO...
authorNoreen Tolland <noreent@google.com>
Mon, 12 May 2014 23:25:43 +0000 (23:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 12 May 2014 23:25:43 +0000 (23:25 +0000)
* commit 'b164425a49dcd5adda308ce5c7212f0ee83f9e7c':


Trivial merge