diff options
author | Jose Lima <joselima@google.com> | 2015-01-28 21:32:37 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2015-01-28 21:32:37 +0000 |
commit | 43181fb72d12bbf4f89a015f5020229b6ee00aab (patch) | |
tree | 17a87b91344172574b2e55cf1d856a37d357643c /telephony/java/android | |
parent | e469fcddbc556e6241be23711bb9ae60fd90243c (diff) | |
parent | 485f6a60e0182767d57a5ab08d6438124a69439e (diff) | |
download | frameworks_base-43181fb72d12bbf4f89a015f5020229b6ee00aab.zip frameworks_base-43181fb72d12bbf4f89a015f5020229b6ee00aab.tar.gz frameworks_base-43181fb72d12bbf4f89a015f5020229b6ee00aab.tar.bz2 |
am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973
automerge: 485f6a6
* commit '485f6a60e0182767d57a5ab08d6438124a69439e':
Fix crash caused by disabling the Options panel on TVs
Diffstat (limited to 'telephony/java/android')
0 files changed, 0 insertions, 0 deletions