summaryrefslogtreecommitdiffstats
path: root/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* fix conflictcodeworkx2011-07-281-3/+1
| | | | Change-Id: I0c5780f462900d0abc2b8dc045eab135f9ce6815
* moved to device/samsung/aries-commonatinm2011-05-171-0/+5