diff options
| author | Gilles Debunne <debunne@google.com> | 2010-10-10 16:50:28 -0700 |
|---|---|---|
| committer | Gilles Debunne <debunne@google.com> | 2010-10-10 16:50:28 -0700 |
| commit | 7499a1ca68ba115efcf53f6a06520c579c44364d (patch) | |
| tree | 751e28dbc292c2d46217c5a16f3942bf1495af79 /graphics/jni | |
| parent | 329430a54e152ad1f5e0003194728988661788bb (diff) | |
| parent | 5d1465490c1b2c18b5425cfc14b405f45b61e281 (diff) | |
| download | frameworks_base-7499a1ca68ba115efcf53f6a06520c579c44364d.zip frameworks_base-7499a1ca68ba115efcf53f6a06520c579c44364d.tar.gz frameworks_base-7499a1ca68ba115efcf53f6a06520c579c44364d.tar.bz2 | |
resolved conflicts for merge of 5d146549 to master
Change-Id: I96c720b9afd4a28d27ed00020551f791e8aefa2b
Diffstat (limited to 'graphics/jni')
0 files changed, 0 insertions, 0 deletions