tree 8df37fe9ba0824e56020adc5fdc2944e187ffb4c
parent b097b9540d8c645803f89ad679bce6433e45f56a
parent 48bb8cdfa431833041345406f2030f92d62e3e4f
author Aurimas Liutikas <aurimas@google.com> 1496909782 +0000
committer android-build-merger <android-build-merger@google.com> 1496909782 +0000

Merge "Remove usages of ActionBarActivity. am: 0eff06dd01 am: baed7559c8" into oc-dr1-dev-plus-aosp
am: 48bb8cdfa4

Change-Id: I8eb1c1adab60716a4465fddfdbfd8089e9221c3a