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)
commita76e3a4677502f8d9f0026d5c7d806cc31fa02fa
tree90e5cbf706d6507769d365b2e4004306ed4e9b67
parent778680a003f2dba06ed2ee45731c6e89215f0833
parent4484a40288768a7bf08a97151714c529eedf8005
Merge changes Id749f453,Ie3ce9dd8 am: 48d10ee126
am: 4484a40288

Change-Id: I51659d1d71480a3b2d4c6c8ba0877d671f1b2788