OSDN Git Service

Merge changes I1eaab5ea,I42928da8
authorHugo Benichi <hugobenichi@google.com>
Wed, 11 Jan 2017 01:14:10 +0000 (01:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Jan 2017 01:14:10 +0000 (01:14 +0000)
commit22e7d2ed201af876f169f41010700e5800f5e7ce
tree29e4a0180fc7287a4bd03f0c329af3a23ed57b98
parent6352f853985966d900e3cc4fe364120f3e06318f
parentb1e3c8aaf42ee3d5910d1f7b93644bf1d05b2eee
Merge changes I1eaab5ea,I42928da8
am: b1e3c8aaf4

Change-Id: I744394de40b72744ac60f3d6c2a138c6e876ee28