summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-01-2356-15/+129
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-2356-15/+129
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-01-231-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge "Java7 Locale & Script related changes."Narayan Kamath2014-01-231-0/+139
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Java7 Locale & Script related changes.Narayan Kamath2014-01-201-0/+139
* | | | | | | | | | resolved conflicts for merge of a5bb65aa to masterChristopher Tate2014-01-222-0/+7
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | am f2c67e24: am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set Settings.Globa...Christopher Tate2014-01-232-0/+7
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | am 8bc01824: am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_A...Christopher Tate2014-01-232-0/+7
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | am 094efb3f: am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILAB...Christopher Tate2014-01-222-0/+7
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | |
| | | | * | | | | | am 407f74f4: Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default va...Christopher Tate2014-01-222-0/+7
| | | | |\ \ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | Merge "Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default value"Christopher Tate2014-01-232-0/+7
| | | | | |\ \ \ \ \
| | | | | | * | | | | Set Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE default valueOskar Grönqvist2014-01-142-0/+7
* | | | | | | | | | | am 6cc8c56a: am 830b3df3: am 6bc2bb15: am 9971cbe9: am 94ac4f68: Add samples ...Dirk Dougherty2014-01-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 830b3df3: am 6bc2bb15: am 9971cbe9: am 94ac4f68: Add samples TOC generated...Dirk Dougherty2014-01-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | am 6bc2bb15: am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsab...Dirk Dougherty2014-01-230-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | am 9971cbe9: am 94ac4f68: Add samples TOC generated from browsable sources.Dirk Dougherty2014-01-220-0/+0
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ am 94ac4f68: Add samples TOC generated from browsable sources.Dirk Dougherty2014-01-230-0/+0
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Add samples TOC generated from browsable sources.Dirk Dougherty2014-01-231-7/+3
* | | | | | | | | | | | | am 222496f8: am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only ...Christopher Tate2014-01-231-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 5d734dbc: am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage ...Christopher Tate2014-01-231-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / /
| | * | | | | | | | | | | am e1d18f6e: am 0e3df216: am cc81bcec: Merge "Only send storage intents after...Christopher Tate2014-01-221-1/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | am 0e3df216: am cc81bcec: Merge "Only send storage intents after boot complete"Christopher Tate2014-01-221-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | am cc81bcec: Merge "Only send storage intents after boot complete"Christopher Tate2014-01-221-1/+2
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / | | | | | |/| | | | | | |
| | | | | * | | | | | | | Merge "Only send storage intents after boot complete"Christopher Tate2014-01-221-1/+2
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / | | | | | |/| | | | | | |
| | | | | | * | | | | | | Only send storage intents after boot completeJohan Redestig2014-01-181-1/+2
* | | | | | | | | | | | | Merge "Check that the exif bits are actually there"Marco Nelissen2014-01-221-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Check that the exif bits are actually thereMarco Nelissen2014-01-221-2/+2
* | | | | | | | | | | | | Merge "Battery stats improvements."Dianne Hackborn2014-01-2210-105/+351
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Battery stats improvements.Dianne Hackborn2014-01-2210-105/+351
* | | | | | | | | | | | | | am ddef0ec9: am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge "cherr...quddusc2014-01-2210-2/+5361
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am fbb2a975: am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb...quddusc2014-01-2210-2/+5361
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am c99557c9: am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs doc...quddusc2014-01-2210-2/+5361
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | am 0cb965a6: am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training c...quddusc2014-01-2110-2/+5361
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | am 5020a873: Merge "cherrypick from jb-mr2-docs docs: Training class for game...quddusc2014-01-2210-2/+5361
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | Merge "cherrypick from jb-mr2-docs docs: Training class for game controllers....quddusc2014-01-2210-2/+5361
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | cherrypick from jb-mr2-docs docs: Training class for game controllers. Change...quddusc2014-01-2110-2/+5361
* | | | | | | | | | | | | | | am 52288441: am ae6531d6: am 69edcce7: am d9d41f2d: am fbdcf317: fix code typoScott Main2014-01-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am ae6531d6: am 69edcce7: am d9d41f2d: am fbdcf317: fix code typoScott Main2014-01-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 69edcce7: am d9d41f2d: am fbdcf317: fix code typoScott Main2014-01-221-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am d9d41f2d: am fbdcf317: fix code typoScott Main2014-01-211-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /
| | | | * | | | | | | | | | | am fbdcf317: fix code typoScott Main2014-01-221-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | | * | | | | | | | | | fix code typoScott Main2014-01-211-1/+1
* | | | | | | | | | | | | | | am 46c95dfc: am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_...Christopher Tate2014-01-221-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am b450505c: am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED di...Christopher Tate2014-01-221-0/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am a7a9327b: am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if p...Christopher Tate2014-01-221-0/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am 5474f085: am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app...Christopher Tate2014-01-211-0/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|/ / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | am 9fc157a4: Merge "FLAG_PRIVILEGED disappears if privileged app is updated a...Christopher Tate2014-01-211-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / | | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | | Merge "FLAG_PRIVILEGED disappears if privileged app is updated and rebooted"Christopher Tate2014-01-221-0/+6
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / / | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | FLAG_PRIVILEGED disappears if privileged app is updated and rebootedNaofumi Harada2014-01-211-0/+6
| | | | | |/ / / / / / / / /
* | | | | | | | | | | | | | Merge "Add "throws IOException" to MediaCodec factory methods"Andy Hung2014-01-217-17/+72
|\ \ \ \ \ \ \ \ \ \ \ \ \ \