| commit | 02d1f43ae539c83aa74cde5cb95490fb0899251b | [log] [tgz] |
|---|---|---|
| author | Wei Wang <weiwa@google.com> | Wed Mar 12 15:18:49 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 12 15:18:49 2014 +0000 |
| tree | 5e7bb864af2ce111220279da054b6842f836aae0 | |
| parent | 8da1525fdd92ce6b0fd798658dd81ff7cc533255 [diff] | |
| parent | b48f5faaa93f52e6ebc6c1d8ccd72df60655c634 [diff] |
am b48f5faa: (-s ours) am 854fcfc6: am 4474fd6b: am b15c6797: Merge "DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130." into klp-dev * commit 'b48f5faaa93f52e6ebc6c1d8ccd72df60655c634': DO NOT MERGE Add Bluetooth privileged permission to bluetooth app. fix b/13226130.