OSDN Git Service

resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
authorDavid Christie <dnchrist@google.com>
Wed, 24 Aug 2016 22:14:24 +0000 (22:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 22:14:24 +0000 (22:14 +0000)
commitdd1016c619cc810bf59f6bd9c4f4aa90418b8264
treec07cb168ffcc36d7a8322dbce8224c1aae53611d
parent6195acc2b55425bb7b0d00fcb9af374d90ee5af9
parent975879a18d7259649a0a82cb266967391a8c0f63
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev
am: 975879a18d

Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167