tree 2c1d94b4d03408567cf27c8d72d31f059d2e8272
parent a99c6eab22265fc288e81ceff4bc26ac3b727406
parent 55883f660d116ed0a2e84869fb429d055b99bdf9
author Tao Bao <tbao@google.com> 1478634487 +0000
committer android-build-merger <android-build-merger@google.com> 1478634487 +0000

resolve merge conflicts of 70172d7 to stage-aosp-master
am: 55883f660d

Change-Id: I5946acb7c1c83061ae84b16d6b94ff502007d981