tree 62ae95e5606b65456e4877a437dfcb3020b7cee1
parent 0e540f47d789bdc6a832ede9670f221347808f1d
parent c5696c721ab9c15050b12e6baeee0388f5f86c3e
author Robert Greenwalt <rgreenwalt@google.com> 1329359739 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329359739 -0800

am 84d8eed0: am fc19160a: Merge "Add a config to set Dun capabilities." into ics-mr1

* commit '84d8eed0d27bae6e6a99a0e73ff71af80edae4d8':