tree af858ad3db5ae254435d009153b7a8e98fe9e91b
parent 97194798abd70c09a274a1539fb52767477dfef6
parent c2a760e68c891c8baeae66cf5837e4025bc68736
author Sudheer Shanka <sudheersai@google.com> 1472166849 +0000
committer android-build-merger <android-build-merger@google.com> 1472166849 +0000

resolve merge conflicts of 270947f to klp-modular-dev am: 76c4b2a7b6  -s ours am: bbbb514bc9 am: 6a50270944 am: a0994c6d58 am: cdf70ba0a3
am: c2a760e68c

Change-Id: I2e5a3bb037921013e78b4270d843cebe239ac520