diff options
| author | Robert Ly <robertly@google.com> | 2011-06-14 15:50:38 -0700 |
|---|---|---|
| committer | Robert Ly <robertly@google.com> | 2011-06-14 15:50:38 -0700 |
| commit | 051d16ebec491f7ab504672f561e97b7e850eb1e (patch) | |
| tree | 330975f9c609bcdecc688024e49186073c0e95f3 /policy | |
| parent | 2fd17c4544f7a81e31c1f30c18293f19a3fa23bc (diff) | |
| parent | 398d021b2f94561609e81fc1f1bdf7c1313cb3e2 (diff) | |
| download | frameworks_base-051d16ebec491f7ab504672f561e97b7e850eb1e.zip frameworks_base-051d16ebec491f7ab504672f561e97b7e850eb1e.tar.gz frameworks_base-051d16ebec491f7ab504672f561e97b7e850eb1e.tar.bz2 | |
resolved conflicts for merge of 398d021b to master
Change-Id: I4f8a2cfec95bf31c38365da0257e8d13897bb197
Diffstat (limited to 'policy')
0 files changed, 0 insertions, 0 deletions