OSDN Git Service

am 147372fd: resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp
authorLajos Molnar <lajos@google.com>
Fri, 19 Sep 2014 13:33:22 +0000 (13:33 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 19 Sep 2014 13:33:22 +0000 (13:33 +0000)
commit6c442e264d5d3568bedb1684fd4b434096848603
tree500055bbdfa62ae5cda51fb136987afa19aee901
parent452f5a16dedcb38d5dec3ecb596fb37bf0eac4d8
parent147372fdf9fae688114121228247497d43514ab7
am 147372fd: resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp

* commit '147372fdf9fae688114121228247497d43514ab7':