OSDN Git Service

am 435d9cde: resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp
authorLajos Molnar <lajos@google.com>
Mon, 27 Oct 2014 04:18:09 +0000 (04:18 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Oct 2014 04:18:09 +0000 (04:18 +0000)
* commit '435d9cde2777950c1d93b0982839d6796c5688b2':


Trivial merge