tree 77f77eab66c0585ef054da27fee2a4dc092459f3
parent c67f9bc2fddc443105811f99401d169dea6da1a4
parent 5a7be749f785931b5c3286cc203701252f88e666
author Nicolas Geoffray <ngeoffray@google.com> 1468486156 +0000
committer android-build-merger <android-build-merger@google.com> 1468486156 +0000

Merge changes I7a052a8e,Idb11b1c0 into nyc-mr1-dev am: 7366e8c16a
am: 5a7be749f7

Change-Id: Idb189d89f9cebcc6e9809e7f489c51baae5e8253