diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 13:17:37 -0800 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-12-07 13:17:37 -0800 |
| commit | 65dd62a306b733b4891aa455b2e099d9c15fffa8 (patch) | |
| tree | b25925b21e13ddb153b47e92011a6ef71099ca3a /libs | |
| parent | 1ab60b44e6d1317d168185666b7597ed1c8029d5 (diff) | |
| parent | ee27dd356e7257f553e8aec74d2c7dcbbde8bd5a (diff) | |
| download | frameworks_base-65dd62a306b733b4891aa455b2e099d9c15fffa8.zip frameworks_base-65dd62a306b733b4891aa455b2e099d9c15fffa8.tar.gz frameworks_base-65dd62a306b733b4891aa455b2e099d9c15fffa8.tar.bz2 | |
resolved conflicts for merge of ee27dd35 to master
Change-Id: Ia9f4ea86b8554ff04a3aa6b9e065239ae73740e7
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions