tree 53215d53951803908be2d4af5f7dc5274d313ad8
parent 1b1a4edb4bc102706d6171901bb15f623adf2d2e
parent 08d0ae9254bee77b81d8d66512cf4b73f8ecaa8b
author Tao Bao <tbao@google.com> 1476485460 -0700
committer Tao Bao <tbao@google.com> 1476485460 -0700

resolve merge conflicts of 08d0ae9 to stage-aosp-master

Change-Id: I4d0cc04fd5853cabdd950691dfb2e7115cb1ff17