tree cdd4cb3dfddd296d4f65a263e3a88161ee7f630e
parent b566ff8d3f79cc4c5a8fb2f3e22aa68a8b864034
parent 0b0aa0d48c9f57e4b1bdf92182d365b32dfed495
author Lajos Molnar <lajos@google.com> 1473446096 +0000
committer android-build-merger <android-build-merger@google.com> 1473446096 +0000

Merge changes I801c77b8,I3d5bad4a into lmp-mr1-dev am: 7c36c95b19 am: 4e3aea6a85 am: 4390796eeb am: 511cbadc98 am: b5ae909c74 am: 890ef9f40f am: 259925187b
am: 0b0aa0d48c

Change-Id: Ic8a135578ccf3be62ead11a1f708b5b71ae52b2a