OSDN Git Service

Merge changes Id749f453,Ie3ce9dd8 am: 48d10ee126
authorColin Cross <ccross@android.com>
Tue, 20 Sep 2016 17:04:00 +0000 (17:04 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 20 Sep 2016 17:04:00 +0000 (17:04 +0000)
am: 4484a40288

Change-Id: I51659d1d71480a3b2d4c6c8ba0877d671f1b2788


Trivial merge