OSDN Git Service

Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp...
authorAndreas Gampe <agampe@google.com>
Fri, 7 Nov 2014 23:15:28 +0000 (23:15 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 7 Nov 2014 23:15:30 +0000 (23:15 +0000)
commit83892ecb5c38f6e8a216e1596cd6a16bf7bd6a55
treec0ca4f84fb798afa5704d02909c3785bdd1de6aa
parent284ab646d879dcca4bcc287b26e8c50abc56666d
parentdc9c109af815100d497184e6dadebceed7f3bf1d
Merge "resolved conflicts for merge of 487ae9b8 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp