summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-12-17 21:28:41 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-17 21:28:41 +0000
commitd9f2f8a1b24d16cb98a36dc77f092529e81b034c (patch)
tree19c8044b3a15012bea75148251f93fa10bd9cab6 /rootdir
parentfed76f85154950a4b2c63ac9e749ee23603e4d2b (diff)
parent417e7467703e637f384530f23850cb2bf852e61b (diff)
downloadsystem_core-d9f2f8a1b24d16cb98a36dc77f092529e81b034c.zip
system_core-d9f2f8a1b24d16cb98a36dc77f092529e81b034c.tar.gz
system_core-d9f2f8a1b24d16cb98a36dc77f092529e81b034c.tar.bz2
am 417e7467: am 286ab6ce: am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"
* commit '417e7467703e637f384530f23850cb2bf852e61b': libdiskconfig: Use uintptr_t instead of uint32_t
Diffstat (limited to 'rootdir')
0 files changed, 0 insertions, 0 deletions