diff options
| author | Jim Miller <jaggies@google.com> | 2015-07-15 22:26:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-15 22:26:05 +0000 |
| commit | 2e56339a4a1133e9aface1c851f1ab67cff72109 (patch) | |
| tree | 7ebbff9fa8de859e6af4f9d719647658f824bab3 /docs/html/sdk/api_diff/20/changes | |
| parent | 66cba90940e4bfa32171523bd4e55f2036a54962 (diff) | |
| parent | bcedcde8093b48c3d013cc57dde42bdd17d6dcb9 (diff) | |
am bcedcde8: am 204c2de8: am c7b0435c: resolved conflicts for merge of 1d4247c4 to mnc-dr-dev
* commit 'bcedcde8093b48c3d013cc57dde42bdd17d6dcb9':
Improve tracking of screen on reasons.
Diffstat (limited to 'docs/html/sdk/api_diff/20/changes')
0 files changed, 0 insertions, 0 deletions