| commit | 7b8164585903b7a9039438e93a95804fcf3d58c6 | [log] [tgz] |
|---|---|---|
| author | Martin Hibdon <mhibdon@google.com> | Sun Nov 02 20:49:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 20:49:03 2014 +0000 |
| tree | d0d2c864e5e4ca654a60dad831008c967f57bb65 | |
| parent | f5ac4d82034a629022763a175078ab726f758a16 [diff] | |
| parent | 8bb4f892551ed2c63e5ff64859f2f3e6a456f809 [diff] |
am 8bb4f892: am e20bcb15: am 1a6aab70: am 81ed7c56: am 11ba4716: Merge "Don\'t show ExtraOption1 unless the application overrides optionHandler" into ub-gmail-ur14-dev * commit '8bb4f892551ed2c63e5ff64859f2f3e6a456f809': Don't show ExtraOption1 unless the application overrides optionHandler