diff options
| author | Ying Wang <wangying@google.com> | 2011-08-11 16:55:00 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-08-11 16:55:00 -0700 |
| commit | 6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8 (patch) | |
| tree | 6e0ca998a952e5e447b46d454f2b8b1843218115 /core/main.mk | |
| parent | c55ebf232e1c0287ef841a5d917cb12feefba2d6 (diff) | |
| parent | a74a4811ae46e24f73b3078c9b7bfe3c4861d03e (diff) | |
| download | build-6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8.zip build-6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8.tar.gz build-6d38bdfc7b9ff699370b4a40dcbdddce0ea713b8.tar.bz2 | |
resolved conflicts for merge of a74a4811 to honeycomb-plus-aosp
Change-Id: I8400ac2bead6aa1a9902d44bf65906084ad353ad
Diffstat (limited to 'core/main.mk')
0 files changed, 0 insertions, 0 deletions