OSDN Git Service

resolve merge conflicts of 2107558 to nyc-dev-plus-aosp
authorXin Li <delphij@google.com>
Fri, 13 May 2016 20:22:03 +0000 (13:22 -0700)
committerXin Li <delphij@google.com>
Fri, 13 May 2016 20:22:03 +0000 (13:22 -0700)
commit98a47b842cb23669ba747d1b0e40f85745d2f330
tree0be4b19b08907a6191c5bab4df4bbb54cfbff0e3
parent9a4de94fe123ce522061def772d1abab5125ba55
parent210755862ee3f4bc9a4f27a4fd1b7faf6710302b
resolve merge conflicts of 2107558 to nyc-dev-plus-aosp

Change-Id: Icdabd960bfab6d6d683b1dc01bc2795ccfb5bcde