OSDN Git Service

am 43d02564: resolved conflicts for merge of dfdabe37 to lmp-mr1-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Wed, 24 Sep 2014 23:02:38 +0000 (23:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Sep 2014 23:02:38 +0000 (23:02 +0000)
* commit '43d0256429c46a1243c8d85a34d029b40fd5e34e':
  Frameworks/base: Early init native bridge


Trivial merge