summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMichael Wright <michaelwr@google.com>2015-04-15 11:21:06 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-15 11:21:06 +0000
commit6fb80b704e7808e4e7cd15f6ccade1e4b6406b56 (patch)
treeca01b3737b9f1235213c8642d42c527f48c57142 /core
parent1f440cb0b8d2c84fd1bb2e06fcc94d86717f648a (diff)
parent99e23088843eddede29d0fc5ca30a83f147f31b0 (diff)
downloadframeworks_base-6fb80b704e7808e4e7cd15f6ccade1e4b6406b56.zip
frameworks_base-6fb80b704e7808e4e7cd15f6ccade1e4b6406b56.tar.gz
frameworks_base-6fb80b704e7808e4e7cd15f6ccade1e4b6406b56.tar.bz2
am 99e23088: am 150e0e87: Merge "fix return value scale of notifyANR()"
* commit '99e23088843eddede29d0fc5ca30a83f147f31b0': fix return value scale of notifyANR()
Diffstat (limited to 'core')
0 files changed, 0 insertions, 0 deletions