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