am 7d952644: merge from open-source master

Browse Source

Merge commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5' into kraken

* commit '7d9526445c8631f347c7bf7d944e5bb1dc35b0b5':
  Support to display message when operation is blocked due to FDN being enabled

...

This commit is contained in:

The Android Open Source Project 2010-05-12 14:12:25 -07:00 committed by Android Git Automerger

parent 8dbc266224 56151325d0

commit 6ddb6ff99e

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