tree 11a77e6abf35ca33e0690c493001afa51f11352c
parent 204e3840263636e31c5ddbb6667fcfaefb360a94
parent e9ea6cbbb3886afc9677dc55830ecd3578a65e4e
author Christine Hallstrom <hallstrom@google.com> 1522960891 -0700
committer android-build-merger <android-build-merger@google.com> 1522960891 -0700

Merge "Add a null check on ActionBar since there isn't one present on Android Wear devices." into pi-dev
am: e9ea6cbbb3

Change-Id: I7d34a448498f51f853f30e0e08aef9a5bc0489f5