summaryrefslogtreecommitdiffstats
path: root/rs
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2014-02-20 04:58:52 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2014-02-20 04:58:52 -0800
commitfca204a4b8771b800383c91465a48eb2cd8b3ba2 (patch)
tree85a387f3b985da8729e91918f56ec7a6ebad3a34 /rs
parentb152473f46d8176e7eb2c55b54342a7a29c525cf (diff)
parent05cebdc2abd05b0dca351306cb039245d50c67ae (diff)
downloadframeworks_base-fca204a4b8771b800383c91465a48eb2cd8b3ba2.zip
frameworks_base-fca204a4b8771b800383c91465a48eb2cd8b3ba2.tar.gz
frameworks_base-fca204a4b8771b800383c91465a48eb2cd8b3ba2.tar.bz2
am 05cebdc2: Merge "Fix several bad function definitions."
* commit '05cebdc2abd05b0dca351306cb039245d50c67ae': Fix several bad function definitions.
Diffstat (limited to 'rs')
0 files changed, 0 insertions, 0 deletions