OSDN Git Service

Merge \\"resolve merge conflicts of cf85fd5 to stage-aosp-master\\" into stage-aosp...
authorColin Cross <ccross@android.com>
Fri, 15 Jul 2016 23:56:40 +0000 (23:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 15 Jul 2016 23:56:40 +0000 (23:56 +0000)
commit56b756661a09c64ff701dc817cc9478d5411a407
treed135935e7b8a753bf6ff69cc79128085fc2fbcdf
parentb6289b56bb91d90885402471886033b223400253
parentf6e9894d185e23bea5a97ab6d87557da6e90ad4a
Merge \\"resolve merge conflicts of cf85fd5 to stage-aosp-master\\" into stage-aosp-master am: 22d5ddcb95
am: f6e9894d18

Change-Id: I70de85907bf2296fefde333cdd8c9ac1a690514b