OSDN Git Service

resolve merge conflicts of 1e92cfb to stage-aosp-master
authorColin Cross <ccross@android.com>
Fri, 15 Jul 2016 22:29:05 +0000 (22:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 22:29:05 +0000 (22:29 +0000)
commit2017d68910ac898881a66b1f31ccddbcc9cd7f7d
tree113260bb35f1bd1c2ccc4919e4f055c1f22e3173
parent6471f228bbcab6d431d495efb0a8961746e2413b
parent4cca8a5573fc3463011c1d937bf27d3f756fcbf9
resolve merge conflicts of 1e92cfb to stage-aosp-master
am: 4cca8a5573

Change-Id: Id1ad45b85e8a06a0a1652d5ce3c8bbdaab5234da