diff options
| author | Sailesh Nepal <sail@google.com> | 2014-03-25 13:02:59 -0700 |
|---|---|---|
| committer | Sailesh Nepal <sail@google.com> | 2014-03-25 13:02:59 -0700 |
| commit | 00ffde305da868401b78f92c3ad33fef0221bf7c (patch) | |
| tree | 455f8032ecb0dddd303edf9c51380e7a7a47a38e /libs | |
| parent | fa1ce103c65c9f4eba708f1555a59959a4581e4e (diff) | |
| parent | 2d72d000939acc10ba0f5000689ad86483b7c19e (diff) | |
| download | frameworks_base-00ffde305da868401b78f92c3ad33fef0221bf7c.zip frameworks_base-00ffde305da868401b78f92c3ad33fef0221bf7c.tar.gz frameworks_base-00ffde305da868401b78f92c3ad33fef0221bf7c.tar.bz2 | |
resolved conflicts for merge of 2d72d000 to master-nova
Change-Id: Icfb617ffab2da2f8805e4628e75e006c620b479d
Diffstat (limited to 'libs')
0 files changed, 0 insertions, 0 deletions