OSDN Git Service

Merge changes I65bc7769,Ib24c7060
authorAndreas Gampe <agampe@google.com>
Tue, 4 Oct 2016 19:12:10 +0000 (19:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 4 Oct 2016 19:12:10 +0000 (19:12 +0000)
commitc3e2247adbde9d27280c3fb33ccc3181f19366e7
tree4f643819c8e960b015a8211d7e09558cb84f4412
parent4d22cfff72b7f746244d4869c8b332defed5a9d4
parentd74bd3a9a48d34d7321f7de7a6f8e1d3467be58a
Merge changes I65bc7769,Ib24c7060
am: d74bd3a9a4

Change-Id: Ic6e0297261b9774b3f58ed1211fa5059d0384062