summaryrefslogtreecommitdiffstats
path: root/sample
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/fr...HEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001staging/cm-13.0+r22stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kcm-13.0Steve Kondik2016-03-102-42/+0
|\
* \ Merge tag 'android-6.0.0_r26' into cm-13.0stable/cm-13.0-ZNH0ERicardo Cerqueira2015-11-051-0/+21
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2015-09-181-0/+21
* | | Chips : Fix recipient list picked contactDanesh M2015-10-181-1/+1
|/ /
* / Import translations. DO NOT MERGEGeoff Mendal2015-05-301-0/+21
|/
* Import translations. DO NOT MERGEGeoff Mendal2015-04-223-0/+63
* Import translations. DO NOT MERGEGeoff Mendal2015-03-211-0/+21
* Import translations. DO NOT MERGEBaligh Uddin2014-10-041-1/+1
* Import translations. DO NOT MERGEBaligh Uddin2014-07-058-0/+168
* Import translations. DO NOT MERGEBaligh Uddin2014-06-2917-0/+357
* am f3f2ad2d: Fix an issue with opt/chips/sample/Android.mk redefining res_dir...Jia Wei Tam2014-05-221-2/+2
|\
| * Fix an issue with opt/chips/sample/Android.mk redefining res_dirs which brokeJia Wei Tam2014-05-211-2/+2
* | am 326d23b6: This is no longer an abstract class.Scott Kennedy2014-04-241-2/+2
|\|
| * This is no longer an abstract class.Scott Kennedy2014-04-241-2/+2
| * Import translations. DO NOT MERGEBaligh Uddin2014-04-0155-0/+1155
* | Import translations. DO NOT MERGEBaligh Uddin2014-04-231-1/+1
* | Import translations. DO NOT MERGEBaligh Uddin2014-04-0155-0/+1155
|/
* Remove all translations for a fresh importScott Kennedy2014-03-3155-1155/+0
* Rename sample and tests to not conflict with frameworks/exScott Kennedy2014-03-211-1/+1
* Update project name and resource include directoriesScott Kennedy2014-03-211-1/+1
* Import translations. DO NOT MERGEBaligh Uddin2013-10-2155-55/+0
* Don't translate "Chips Sample"Scott Kennedy2013-10-181-1/+1
* Merge chips from jb-ub-mail-ur11 into klp-ub-devScott Kennedy2013-10-1063-0/+1386