diff options
| author | Joe Fernandez <joefernandez@google.com> | 2015-01-07 10:19:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-01-07 10:19:59 +0000 |
| commit | 597da2488a613977e83b9df7b29ec3440d2b03b8 (patch) | |
| tree | acd7b1a0f15abac6562dcf26dbc29851bfa3292c /docs/html/sdk/api_diff/20/changes | |
| parent | d52531f9adb5b47530eb73843cccbd570d4986a6 (diff) | |
| parent | b1c7f0215bc36b5f27d226d1fc085be99201fe7b (diff) | |
am 909f840c: am 4c5b5cff: Merge "resolved conflicts for merge of ea0137ef to lmp-mr1-dev" into lmp-mr1-dev
automerge: b1c7f02
* commit 'b1c7f0215bc36b5f27d226d1fc085be99201fe7b':
docs: Checklist for TV Apps
Diffstat (limited to 'docs/html/sdk/api_diff/20/changes')
0 files changed, 0 insertions, 0 deletions