tree e8b37e5fbeeee31ede838568a70e86e1365267bd
parent 0f6c4a0e8fe270528613f91a5b3c82eb3f118e59
parent b5f75c458270fc49ea4c61ed7126155531c5ca63
author Narayan Kamath <narayan@google.com> 1474479352 +0000
committer android-build-merger <android-build-merger@google.com> 1474479352 +0000

resolve merge conflicts of a47780b to lmp-dev am: 61f27551c7
am: b5f75c4582

Change-Id: Iacea86ad3c142d6f14b5fbdfb5b615f4705b1bd1