OSDN Git Service

Merge "Fix a bug where options menu was not showing." into oc-dev
authorDaniel Nishi <dhnishi@google.com>
Mon, 17 Apr 2017 22:39:31 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 17 Apr 2017 22:39:31 +0000 (22:39 +0000)
commite69e9d74c588306ba115e77b2c21b7b0838bfd98
treed33c17563ba59bb11c7c88bab3fbf177264e90ce
parentd5178f2bf0c0affc79d9673e9b0c9c8ba4ee4b8c
parent4f2f6bcad903da2b3651280407d4c24227602d30
Merge "Fix a bug where options menu was not showing." into oc-dev
am: 4f2f6bcad9

Change-Id: I9bfa738b7d7010955ea26b162573bdb68dbbcef5