diff options
| author | Julia Reynolds <juliacr@google.com> | 2016-05-18 14:31:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-05-18 14:31:03 +0000 |
| commit | 43153f18c5c6f937789c70c8b378a808f3db83eb (patch) | |
| tree | 74af60c80edb9b90c31f30708edaa52b8ab0882e /docs/html/sdk/api_diff/20/changes | |
| parent | a90127dcc8b5d1b9a7eb7a1c1d5eed9c87eb36ed (diff) | |
| parent | cc8c594a5c5cb255907cb2eaddb37ea1321fa104 (diff) | |
resolve merge conflicts of 5201a62 to nyc-dev-plus-aosp
am: cc8c594a5c
* commit 'cc8c594a5c5cb255907cb2eaddb37ea1321fa104':
Handle PhoneStatusBarPolicy user switch callbacks on main thread
Change-Id: I816905527f5061e7af2fe14b42f9c0397036bdb7
Diffstat (limited to 'docs/html/sdk/api_diff/20/changes')
0 files changed, 0 insertions, 0 deletions