OSDN Git Service

resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
authorChristopher Tate <ctate@google.com>
Fri, 17 Jun 2016 00:18:48 +0000 (00:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 17 Jun 2016 00:18:48 +0000 (00:18 +0000)
commite2c9b1af3e68a66e18a16c2b658f925fceb16980
tree72b6f21cf1ec530ddad8670b352e6fe00cf59293
parentdb843c913f67230da010aa60d4e83632556e98c3
parentd6c1126fabdf91624715a42c199099f3c8b3a962
resolve merge conflicts of cffb19c to mnc-dev am: 3f9ea2d386
am: d6c1126fab

Change-Id: I0414a137b1aab218fa57f291dbf2f7a1519bd973