OSDN Git Service

resolve merge conflicts of acc275a to nyc-dev-plus-aosp
authorChih-Hung Hsieh <chh@google.com>
Mon, 25 Apr 2016 22:59:19 +0000 (15:59 -0700)
committerChih-Hung Hsieh <chh@google.com>
Mon, 25 Apr 2016 22:59:19 +0000 (15:59 -0700)
commit2f94665879231866f0395bc2d9df369a4562e0db
tree41495514ebcc18f54898efbb185deb1e0d69cfc2
parente1d4c714b382b29130f3737e5382bd57a700d4b3
parentacc275a57c633581cad3b69c0d1003351df442e5
resolve merge conflicts of acc275a to nyc-dev-plus-aosp

Change-Id: Ia8f82614a3501d631c074667dfebc5e56e142752