| commit | e20bcb153cc19555db25dd3f171b40ba71826919 | [log] [tgz] |
|---|---|---|
| author | Martin Hibdon <mhibdon@google.com> | Sun Nov 02 19:34:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Nov 02 19:34:07 2014 +0000 |
| tree | 0aabd3cc24078268bf3ffa4bfc5cc9621fcf4bc9 | |
| parent | 98273beb0cf0157b7fa040b181ff4fa97161c426 [diff] | |
| parent | 1a6aab705c1a27b79df06242bf467cfcfba29493 [diff] |
am 1a6aab70: am 81ed7c56: am 11ba4716: Merge "Don\'t show ExtraOption1 unless the application overrides optionHandler" into ub-gmail-ur14-dev * commit '1a6aab705c1a27b79df06242bf467cfcfba29493': Don't show ExtraOption1 unless the application overrides optionHandler