tree 6ecb52f284f1d0a7fd7d3d4961c3894f172ceea7
parent 39bafe6fc8d57b905b4efca56c047e7ac2fbf373
parent 819c7f83e3f9bb1bcdf83cc047e7986196bf4ff0
author Erik Kline <ek@google.com> 1501124223 +0000
committer android-build-merger <android-build-merger@google.com> 1501124223 +0000

Revert "resolve merge conflicts of a260b85 to stage-aosp-master" am: f20322560e
am: 819c7f83e3

Change-Id: Ia19a8df6360064a791a355c9f0cceb062668165f