tree 2c1d94b4d03408567cf27c8d72d31f059d2e8272
parent d447124c00b37da341cf88d9cb533e35d684a89a
parent 5d5230348864049f0acc674840312ade5a690d96
author Tao Bao <tbao@google.com> 1478634787 +0000
committer android-build-merger <android-build-merger@google.com> 1478634787 +0000

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

Change-Id: I15771163a003a498dbe7d9731f90e29171b97d7d