OSDN Git Service

resolved conflicts for merge of 08ff8021 to lmp-dev-plus-aosp
authorHans Boehm <hboehm@google.com>
Wed, 3 Sep 2014 06:08:28 +0000 (23:08 -0700)
committerHans Boehm <hboehm@google.com>
Wed, 3 Sep 2014 06:08:28 +0000 (23:08 -0700)
commit4a29a80fff163a86959be2e3eb0f4a9d739b5f7d
tree6707b2c64843e414ccb8a56dc1634456c5b61053
parent883fccb5f89c005502af27a18322f9fa302ac1b3
parent08ff802151ea3089a5f352dfc795c99017c1d122
resolved conflicts for merge of 08ff8021 to lmp-dev-plus-aosp

Change-Id: I7b57ce5e7d32f6ba4372d7b4af590cc74fd2c7e8