tree e324fc2b6a594d6b39e8fe8e2a4aa20ad065c5ce
parent a5a2c88fb3ac43315575de94696c837cb6b88c35
parent 698e044717e1106bbd8a63798b062a9d31e9ddb1
author fionaxu <fionaxu@google.com> 1465406607 +0000
committer android-build-merger <android-build-merger@google.com> 1465406607 +0000

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

Change-Id: I5a00c0b206cae8a13f860783756ffa66c08db65d