diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-06-04 20:43:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-04 20:43:02 +0000 |
| commit | 1ef8b7cb3def915c54f99f6d2c44c5a1d702b002 (patch) | |
| tree | 752f336e2c91d9552052a5949e565d81ba0b42a2 /docs/html/sdk/api_diff/17/changes | |
| parent | be9c94ef26d6fc70fc7708a0d264b42c48fe6189 (diff) | |
| parent | 3c15d8d6889806d0b517eec03ed6a4f8728ebc16 (diff) | |
am 3c15d8d6: (-s ours) am 14104896: am e4aa3138: am a9e82914: Merge branch \'klp-dev\' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev
* commit '3c15d8d6889806d0b517eec03ed6a4f8728ebc16':
Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
Diffstat (limited to 'docs/html/sdk/api_diff/17/changes')
0 files changed, 0 insertions, 0 deletions