tree b46c8ec6406b3c0c40b7b48f485519d89d397803
parent cbdc4b5f66b6019137eee7025ea31b9f3e8320c7
parent a9fc8b70a631c8e0fc8f678e257343cdd5cdd1f5
author Jeff Gaston <jeffrygaston@google.com> 1495233017 +0000
committer android-build-merger <android-build-merger@google.com> 1495233017 +0000

Merge remote-tracking branch 'aosp/upstream-master' into master am: ce2d33f314 am: 3af440b397 am: 371076c25f
am: a9fc8b70a6

Change-Id: Ib6bd0292793f33259e9ea5b3376bccab72d29551