OSDN Git Service

resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258...
authorDmitry Dementyev <dementyev@google.com>
Wed, 8 Mar 2017 19:15:40 +0000 (19:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 8 Mar 2017 19:15:40 +0000 (19:15 +0000)
commitdef3eddb431e2303da84e8a5c15eed699e9f5a98
tree10d0b87e6e065bff179161a62f969e1c549c28a6
parent94a0fa5759586f7748e734f9f93c7c0fded18a2d
parentb7e254521758e3257be74b2385a65874ec8b7bda
resolve merge conflicts of 75ae46d035 to lmp-mr1-dev am: e24780ed4c am: 5c4276a258 am: 3a5e567ab9
am: b7e2545217

Change-Id: I40643a3a88c3ec9344604917dd0e765cd9078f29