summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "ImageReader: Switch to RAW16 from RAW_SENSOR"Eino-Ville Talvala2015-02-201-3/+3
|\
| * ImageReader: Switch to RAW16 from RAW_SENSOREino-Ville Talvala2015-02-191-3/+3
* | Merge "Backup/restore owner info from locksettings"Amith Yamasani2015-02-202-4/+118
|\ \
| * | Backup/restore owner info from locksettingsAmith Yamasani2015-02-182-4/+118
* | | am 8c087c04: am 4fecab57: Merge commit \'32acf753e8989766f67fd5300d3eb467f707...Bill Yi2015-02-200-0/+0
|\ \ \
| * \ \ am 4fecab57: Merge commit \'32acf753e8989766f67fd5300d3eb467f707cc79\' into HEADBill Yi2015-02-200-0/+0
| |\ \ \
| | * \ \ Merge commit '32acf753e8989766f67fd5300d3eb467f707cc79' into HEADBill Yi2015-02-194004-250178/+716981
| | |\ \ \
* | | \ \ \ Merge "Mark Service#onBind() @Nullable"Scott Kennedy2015-02-191-0/+2
|\ \ \ \ \ \
| * | | | | | Mark Service#onBind() @NullableScott Kennedy2015-02-191-0/+2
* | | | | | | Merge "Changing AudioManager.listAudioDevicePorts to take a ArrayList<AudioDe...Paul McLean2015-02-193-17/+14
|\ \ \ \ \ \ \
| * | | | | | | Changing AudioManager.listAudioDevicePorts to take a ArrayList<AudioDevicePor...Paul McLean2015-02-193-17/+14
* | | | | | | | Merge "Annotate the parameter in TextUtils#isEmpty() as @Nullable"Scott Kennedy2015-02-191-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Annotate the parameter in TextUtils#isEmpty() as @NullableScott Kennedy2015-02-191-1/+2
* | | | | | | | Merge "Audio Device Enumeration API."Paul McLean2015-02-193-2/+302
|\ \ \ \ \ \ \ \
| * | | | | | | | Audio Device Enumeration API.Paul McLean2015-02-193-2/+302
* | | | | | | | | Merge "Code cleanup"Fyodor Kupolov2015-02-191-182/+58
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Code cleanupFyodor Kupolov2015-02-191-182/+58
* | | | | | | | | | am f077f476: am c808f6a6: am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393:...kmccormick2015-02-192-3/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | am c808f6a6: am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b:...kmccormick2015-02-192-3/+3
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ am a8dbdb1c: am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: ...kmccormick2015-02-192-3/+3
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ am bb1c03e9: am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescap...kmccormick2015-02-192-3/+3
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ am a4fce24d: am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brac...kmccormick2015-02-192-3/+3
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ am e16f4393: am 506cba8b: Doc Update: fixed unescaped angle brackets in code ...kmccormick2015-02-192-3/+3
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ am 506cba8b: Doc Update: fixed unescaped angle brackets in code snippets.kmccormick2015-02-192-3/+3
| | | | | | |\ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | Doc Update: fixed unescaped angle brackets in code snippets.kmccormick2015-02-192-3/+3
* | | | | | | | | | | | | | | Merge "Add intent for configuring RespondViaSms."Andrew Lee2015-02-193-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Add intent for configuring RespondViaSms.Andrew Lee2015-02-193-0/+8
* | | | | | | | | | | | | | | | am 925be07b: am 87ea3f79: am cdd5ebec: am 7319ea27: am cc883a1f: am 1e0face2:...Rich Slogar2015-02-194-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 87ea3f79: am cdd5ebec: am 7319ea27: am cc883a1f: am 1e0face2: am b87aa6cb:...Rich Slogar2015-02-194-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | am cdd5ebec: am 7319ea27: am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs:...Rich Slogar2015-02-194-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | am 7319ea27: am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link ...Rich Slogar2015-02-194-4/+4
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | am cc883a1f: am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into...Rich Slogar2015-02-194-4/+4
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | am 1e0face2: am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docsRich Slogar2015-02-194-4/+4
| | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / | | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | | am b87aa6cb: Merge "docs: mipmap link updates" into lmp-docsRich Slogar2015-02-194-4/+4
| | | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | |/ / / / / / / / | | | | | | | |/| | | | | | | |
| | | | | | | * | | | | | | | | Merge "docs: mipmap link updates" into lmp-docsRich Slogar2015-02-194-4/+4
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | | * | | | | | | | | docs: mipmap link updatesRich Slogar2015-02-194-4/+4
* | | | | | | | | | | | | | | | | am d4eadffd: am 6a9e48ac: am 3a0483e2: am 73cd35f2: am f213a8c9: am 14bb9188:...Rich Slogar2015-02-191-16/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 6a9e48ac: am 3a0483e2: am 73cd35f2: am f213a8c9: am 14bb9188: am f4f059d4:...Rich Slogar2015-02-191-16/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | am 3a0483e2: am 73cd35f2: am f213a8c9: am 14bb9188: am f4f059d4: docs: studio...Rich Slogar2015-02-191-16/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | am 73cd35f2: am f213a8c9: am 14bb9188: am f4f059d4: docs: studio 1.1 downloadsRich Slogar2015-02-191-16/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | am f213a8c9: am 14bb9188: am f4f059d4: docs: studio 1.1 downloadsRich Slogar2015-02-191-16/+16
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / /
| | | | | * | | | | | | | | | | | am 14bb9188: am f4f059d4: docs: studio 1.1 downloadsRich Slogar2015-02-191-16/+16
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / /
| | | | | | * | | | | | | | | | | am f4f059d4: docs: studio 1.1 downloadsRich Slogar2015-02-191-16/+16
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / /
| | | | | | | * | | | | | | | | | docs: studio 1.1 downloadsRich Slogar2015-02-191-16/+16
* | | | | | | | | | | | | | | | | am 907bcd96: am 644ebc88: am 0a7936b7: Merge "Fix a couple of issues with sys...Narayan Kamath2015-02-192-9/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 644ebc88: am 0a7936b7: Merge "Fix a couple of issues with system_server fo...Narayan Kamath2015-02-192-9/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 0a7936b7: Merge "Fix a couple of issues with system_server forking."Narayan Kamath2015-02-192-9/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix a couple of issues with system_server forking."Narayan Kamath2015-02-192-9/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | Fix a couple of issues with system_server forking.Narayan Kamath2015-02-132-9/+13
* | | | | | | | | | | | | | | | | | | am 9853ae6b: am 3f711044: am 9c6c8df4: am 3dfd6389: Merge "Fix accessibility ...Jim Miller2015-02-191-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /