tree 6deb0f73301dde2c9db62c6f7d8b4b1a5dedae21
parent dcc716336d4c94fe7bc914ac36b8d0f7b7ce3278
parent 3972ce8ab3814845209e0c24b6fd2b8fe00c03b6
author Tao Bao <tbao@google.com> 1479284258 +0000
committer android-build-merger <android-build-merger@google.com> 1479284258 +0000

resolve merge conflicts of 4f86f26 to stage-aosp-master am: f83101a911 am: 7563bad2ac
am: 3972ce8ab3

Change-Id: I6eeab248bdeb83e5672a8861ce82743f92780f37