tree df95775c0acb900659ae557d11986d8acbde4802
parent 94c8855da6c1e5800723d1eaeceb1cba841bea6b
parent c10e4fae05b84b4564496be9e3261ceb3b784da5
author fionaxu <fionaxu@google.com> 1465410256 +0000
committer android-build-merger <android-build-merger@google.com> 1465410256 +0000

resolve merge conflicts of 2c53526 to lmp-mr1-dev am: c196526f8e am: 1e8fe12f4e am: 965084dd0c am: 698e044717 am: c95d552de0
am: c10e4fae05

Change-Id: I8e5e9345aa8eeeae5a7af94a4cac892ee8e558ee