summaryrefslogtreecommitdiffstats
path: root/docs/html/tools/revisions/platforms.jd
diff options
context:
space:
mode:
authorMark Renouf <mrenouf@google.com>2014-11-01 14:57:05 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-11-01 14:57:05 +0000
commit1fc26a481c0b5465dc5adcb51040b81b59d7fdaf (patch)
treec1ecf40aefc6167c78f7ae8d986fd48364bb63d8 /docs/html/tools/revisions/platforms.jd
parent3d6f449cd24056ecfab4300ef55fb8e20919c631 (diff)
parent381dfa704d68fa6219732f5e95c38c219ef097bd (diff)
downloadframeworks_base-1fc26a481c0b5465dc5adcb51040b81b59d7fdaf.zip
frameworks_base-1fc26a481c0b5465dc5adcb51040b81b59d7fdaf.tar.gz
frameworks_base-1fc26a481c0b5465dc5adcb51040b81b59d7fdaf.tar.bz2
am 2182bf5a: am 3d875f80: am cf0f740e: (-s ours) If no display settings are matched, return the first one. DO NOT MERGE automerge: 024bc87 -s ours
automerge: 381dfa7 -s ours * commit '381dfa704d68fa6219732f5e95c38c219ef097bd': If no display settings are matched, return the first one. DO NOT MERGE
Diffstat (limited to 'docs/html/tools/revisions/platforms.jd')
0 files changed, 0 insertions, 0 deletions