am 247aef75: (-s ours) am 490701a3: (-s ours) DO NOT MERGE ANYWHERE. reset to mnc-dev at 9cd60fe.

Browse Source

* commit '247aef7564be66179a988e74bd695c324e36f6dd':

main

Qiwen Zhao 2015-07-15 17:17:27 +00:00 committed by Android Git Automerger

parent 2bc2b351eb 247aef7564

commit 16b9a0ba09

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 Not Available