diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-07-22 08:01:59 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-22 08:01:59 -0700 |
| commit | 70cdc26dfcb04676d981afb62be038440296bf94 (patch) | |
| tree | 0e17f8634fde59cdb8e3c869f510b60b216166b5 /libutils/FileMap.cpp | |
| parent | f1ae7bd998bb236c1ef4eafb73945856c132f626 (diff) | |
| parent | ef6ef9673ddd66861e51ef077ff3cbe8cb7fe0e1 (diff) | |
am ef6ef967: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit 'ef6ef9673ddd66861e51ef077ff3cbe8cb7fe0e1':
init: Increase maximum number of Android properties to 372
Diffstat (limited to 'libutils/FileMap.cpp')
0 files changed, 0 insertions, 0 deletions