am 0a5500a8: resolved conflicts for merge of 0dd1a828 to master

Browse Source

* commit '0a5500a8fc6040e556f25c1235ec010e1c74866d':
  Volume panel should not clear system ui flags.

...

This commit is contained in:

John Spurlock

2014-03-04 14:39:54 -08:00

committed by Android Git Automerger

parent 5000a95482 0a5500a8fc

commit bd4c10f8d7

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