OSDN Git Service

resolve merge conflicts of ae7641a to nyc-dev-plus-aosp
authorPavlin Radoslavov <pavlin@google.com>
Tue, 7 Jun 2016 21:41:08 +0000 (14:41 -0700)
committerPavlin Radoslavov <pavlin@google.com>
Tue, 7 Jun 2016 21:41:08 +0000 (14:41 -0700)
commitc7d4074aef4aee0d7ec7e2d1413cf370f6756291
tree85678c6d72a00b60c9182624550bf3b9ab79345c
parentc8e1206ad57f5a359b1e4a193f50f143c9028439
parentae7641a894fd3bfdfc85ed46d831714ac63edff4
resolve merge conflicts of ae7641a to nyc-dev-plus-aosp

Change-Id: I63d00b98c27d7fa1f30385e030b6ffee5e86dc73