am ef6ef967: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge

Browse source

* commit 'ef6ef9673ddd66861e51ef077ff3cbe8cb7fe0e1':
  init: Increase maximum number of Android properties to 372

...

This commit is contained in:

The Android Open Source Project 2013-07-22 08:01:59 -07:00 • committed by Android Git Automerger

parent f1ae7bd998 ef6ef9673d

commit 70cdc26dfc

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available