am ce1b22cf: (-s ours) am c4231382: DO NOT MERGE Settings: Implement new required method.

Browse Source

* commit 'ce1b22cf66b853ba834bf963ab8a6a45e829fd15':
  DO NOT MERGE Settings: Implement new required method.

...

This commit is contained in:

John Spurlock

2014-03-28 19:07:37 +00:00

committed by Android Git Automerger

parent 57e109935b ce1b22cf66

commit c6d4a7edc3

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

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available