diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-08-21 09:53:41 +0200 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2015-08-21 09:53:41 +0200 |
| commit | b60bc0ece2b2714845eff37c97cb19d41a308122 (patch) | |
| tree | 16e677f43d12976b428f95f79ad458e2329010e5 /docs | |
| parent | 504623e1a7b20ff7ce66ec487fb329f4b3d2c3cf (diff) | |
| parent | a2d193183fc4f5727c0b875a48c5dd8032bc87bb (diff) | |
| download | frameworks_base-b60bc0ece2b2714845eff37c97cb19d41a308122.zip frameworks_base-b60bc0ece2b2714845eff37c97cb19d41a308122.tar.gz frameworks_base-b60bc0ece2b2714845eff37c97cb19d41a308122.tar.bz2 | |
resolved conflicts for merge of a2d19318 to lmp-mr1-ub-dev
Change-Id: I4cb38241b5efab1eb7af161e1589fa477a473a39
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions