tree 2a0c0a6d49c9bb98ed2d0758b5b2d397ca93aeb2
parent 07dcf7abc6d0754e2f3e7443b983c399851e18d7
parent 932fe93df7be79d27d49243a4d6274c1a2612361
author Eino-Ville Talvala <etalvala@google.com> 1465590018 +0000
committer android-build-merger <android-build-merger@google.com> 1465590018 +0000

Merge changes I069e2b7e,Ic5e9e58a into nyc-dev am: f4de8dd77c
am: 932fe93df7

Change-Id: Id88c1935ff478bbd03be838dce5faa7a39631b59