summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-05-19 13:33:19 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-19 13:33:19 +0000
commit9672ee125d6aee73bf1e5425c4089285714f25bf (patch)
tree0bcb31cdc82007596420924b91b057f4adf990f0 /docs
parent4088970dce354f53911f78084a32cb78af45baaf (diff)
parentdeda5467f44fc4a03c3435f0c6d7bda4ea298b99 (diff)
downloadframeworks_base-9672ee125d6aee73bf1e5425c4089285714f25bf.zip
frameworks_base-9672ee125d6aee73bf1e5425c4089285714f25bf.tar.gz
frameworks_base-9672ee125d6aee73bf1e5425c4089285714f25bf.tar.bz2
am deda5467: am a4fd1baa: Merge "Fail if we\'re unable to agree on an ISA for shared UIDs."
* commit 'deda5467f44fc4a03c3435f0c6d7bda4ea298b99': Fail if we're unable to agree on an ISA for shared UIDs.
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions