OSDN Git Service

am 83bae4aa: am bc667f1c: am 08f336ea: fix regression from Change-Id: I88c1e8192f1cbb...
authorsmain@google.com <smain@google.com>
Mon, 3 Nov 2014 20:33:34 +0000 (20:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 Nov 2014 20:33:34 +0000 (20:33 +0000)
* commit '83bae4aad4df090d30435249941fd5348aa69b16':


Trivial merge