OSDN Git Service

resolve merge conflicts of 17350b5 to nyc-mr1-dev-plus-aosp
authorChien-Yu Chen <cychen@google.com>
Wed, 17 Aug 2016 19:11:37 +0000 (12:11 -0700)
committerChien-Yu Chen <cychen@google.com>
Wed, 17 Aug 2016 19:11:37 +0000 (12:11 -0700)
commit32310bc024d07eed86550200ac55c08a08bd7e3b
tree0f7e31d516f88b0118c3d2e509e48227e5e065d6
parentfad58c8833a0086ae003720f14cb6a11d4d4916a
parent17350b5725246d0d9a134d6b2100446169790487
resolve merge conflicts of 17350b5 to nyc-mr1-dev-plus-aosp

Change-Id: Ic970fcd12be781414c6515dac35d11caf6ca9412