tree 66b576493d39f37c32ad3c83aaa30e5951bd4e3f
parent 0daded40468fb4d1d0bc4755a3c77058a8ef25e5
parent 03836e31a94e942987d182588a861c40129e2dda
author Marie Janssen <jamuraa@google.com> 1477940450 +0000
committer android-build-merger <android-build-merger@google.com> 1477940450 +0000

resolve merge conflicts of 6a31a5c to stage-aosp-master am: 879a5169ec am: 635d528877
am: 03836e31a9

Change-Id: Iefdedf47a91d398ca3c45656a4d73749acd03e6d