tree 9678ecc0ee37f2ad493e47dbe9589965aef15e88
parent f6659ebf9ab2435948d43279c54c56171fc04131
parent 6ef92c0fcb4a8453e312403c1260789b1a6809c2
author Steve Muckle <smuckle@google.com> 1488516368 +0000
committer android-build-merger <android-build-merger@google.com> 1488516368 +0000

Merge remote-tracking branch 'aosp/upstream-master' into HEAD am: 516099405c am: 5837e8351b
am: 6ef92c0fcb

Change-Id: If09aedbc03c7fac2a691a9a026c0597df36ad596