OSDN Git Service

Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev am: 7366e8c16a
authorNicolas Geoffray <ngeoffray@google.com>
Thu, 14 Jul 2016 08:49:16 +0000 (08:49 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 14 Jul 2016 08:49:16 +0000 (08:49 +0000)
commit19e0f615caff71586d7e968d84f4d08ef2385396
tree77f77eab66c0585ef054da27fee2a4dc092459f3
parentc67f9bc2fddc443105811f99401d169dea6da1a4
parent5a7be749f785931b5c3286cc203701252f88e666
Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev am: 7366e8c16a
am: 5a7be749f7

Change-Id: Idb189d89f9cebcc6e9809e7f489c51baae5e8253