| Commit message (Expand) | Author | Age | Files | Lines |
* | resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp | Vladimir Marko | 2015-01-08 | 0 | -0/+0 |
|\ |
|
| * | resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aosp | Vladimir Marko | 2015-01-08 | 0 | -0/+0 |
| |\ |
|
| | * | am e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." i... | Vladimir Marko | 2015-01-08 | 1 | -4/+9 |
| | |\ |
|
| | | * | Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-dev | Vladimir Marko | 2015-01-08 | 1 | -4/+9 |
| | | |\ |
|
| | | | * | Check for OOM in BitmapFactory's getMimeTypeString(). | Vladimir Marko | 2015-01-07 | 1 | -4/+9 |
* | | | | | Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyMa... | Bryce Lee | 2015-01-08 | 1 | -1/+3 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyMa... | Bryce Lee | 2015-01-08 | 1 | -1/+3 |
| |\ \ \ \
| | |/ / / |
|
| | * | | | Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyMa... | Bryce Lee | 2015-01-08 | 1 | -1/+3 |
| | |\ \ \
| | | |/ / |
|
| | | * | | Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyMa... | Bryce Lee | 2015-01-08 | 1 | -1/+3 |
| | | |\ \ |
|
| | | | * | | Revert "GpsLocationProvider: Read data enabled status from TelephonyManager." | Bryce Lee | 2015-01-08 | 1 | -1/+3 |
* | | | | | | am 62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallba... | Jinsuk Kim | 2015-01-08 | 3 | -13/+66 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | am 62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallba... | Jinsuk Kim | 2015-01-08 | 3 | -13/+66 |
| |\ \ \ \ \
| | |/ / / / |
|
| | * | | | | Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput... | Jinsuk Kim | 2015-01-08 | 3 | -13/+66 |
| | |\ \ \ \
| | | |/ / / |
|
| | | * | | | Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput... | Jinsuk Kim | 2015-01-08 | 3 | -13/+66 |
| | | |\ \ \ |
|
| | | | * | | | CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput | Jinsuk Kim | 2015-01-08 | 3 | -13/+66 |
* | | | | | | | am 321bf433: am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" in... | Deepanshu Gupta | 2015-01-08 | 3 | -2/+68 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 3 | -2/+68 |
| |\ \ \ \ \ \
| | |/ / / / / |
|
| | * | | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 3 | -2/+68 |
| | |\ \ \ \ \
| | | |/ / / / |
|
| | | * | | | | Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 3 | -2/+68 |
| | | |\ \ \ \ |
|
| | | | * | | | | Replace java.util.LinkedHashMap.eldest() | Deepanshu Gupta | 2015-01-07 | 3 | -2/+68 |
* | | | | | | | | am f0da92bf: am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1... | Deepanshu Gupta | 2015-01-08 | 1 | -0/+5 |
|\ \ \ \ \ \ \ \
| |/ / / / / / / |
|
| * | | | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -0/+5 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -0/+5 |
| | |\ \ \ \ \ \
| | | |/ / / / / |
|
| | | * | | | | | Merge "Add missing DateFormat method." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -0/+5 |
| | | |\ \ \ \ \
| | | | |/ / / / |
|
| | | | * | | | | Add missing DateFormat method. | Deepanshu Gupta | 2015-01-07 | 1 | -0/+5 |
* | | | | | | | | am f45420d0: am 565b6b41: Merge "Update platform.dir search in tests." into l... | Deepanshu Gupta | 2015-01-08 | 1 | -2/+18 |
|\ \ \ \ \ \ \ \
| |/ / / / / / / |
|
| * | | | | | | | am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -2/+18 |
| |\ \ \ \ \ \ \
| | |/ / / / / / |
|
| | * | | | | | | am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -2/+18 |
| | |\ \ \ \ \ \
| | | |/ / / / / |
|
| | | * | | | | | Merge "Update platform.dir search in tests." into lmp-mr1-dev | Deepanshu Gupta | 2015-01-08 | 1 | -2/+18 |
| | | |\ \ \ \ \
| | | | |/ / / /
| | | | | / / /
| | | | |/ / /
| | | |/| | | |
|
| | | | * | | | Update platform.dir search in tests. | Deepanshu Gupta | 2015-01-07 | 1 | -2/+18 |
* | | | | | | | am bcba2182: Merge "check ntpserver as empty string instead of null" automerg... | Jeff Sharkey | 2015-01-08 | 1 | -1/+2 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|
| * | | | | | | Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1 | Jeff Sharkey | 2015-01-08 | 1 | -1/+2 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | Merge "check ntpserver as empty string instead of null" | Jeff Sharkey | 2015-01-08 | 1 | -1/+2 |
| | |\ \ \ \ \ \ |
|
| | | * \ \ \ \ \ | Merge "check ntpserver as empty string instead of null" | Jeff Sharkey | 2015-01-08 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ |
|
| | | | * | | | | | | check ntpserver as empty string instead of null | Young-Ho Cha | 2015-01-08 | 1 | -1/+2 |
* | | | | | | | | | | Merge "Add popup window accessors for anchor overlap, gravity, window" | Alan Viverette | 2015-01-08 | 4 | -36/+95 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | Add popup window accessors for anchor overlap, gravity, window | Alan Viverette | 2015-01-07 | 4 | -36/+95 |
* | | | | | | | | | | | Merge "API for tinting TextView compound drawables" | Alan Viverette | 2015-01-08 | 4 | -150/+295 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | API for tinting TextView compound drawables | Alan Viverette | 2015-01-07 | 4 | -150/+295 |
* | | | | | | | | | | | | am 5df729ad: am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenki... | Deepanshu Gupta | 2015-01-08 | 1 | -4/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / /
| |/| | | | | | | | | | |
|
| * | | | | | | | | | | | am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." ... | Deepanshu Gupta | 2015-01-08 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|/ / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev ... | Deepanshu Gupta | 2015-01-07 | 1 | -4/+6 |
| | |\ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|/ / / /
| | | |/| | | | | | | | |
|
| | | * | | | | | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev | Deepanshu Gupta | 2015-01-07 | 1 | -4/+6 |
| | | |\ \ \ \ \ \ \ \ \ |
|
| | | | * \ \ \ \ \ \ \ \ | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev | Deepanshu Gupta | 2015-01-07 | 1 | -4/+6 |
| | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | * \ \ \ \ \ \ \ \ | Merge "Fix tests on jenkins, take 2." into lmp-dev | Deepanshu Gupta | 2015-01-07 | 1 | -4/+6 |
| | | | | |\ \ \ \ \ \ \ \ \ |
|
| | | | | | * | | | | | | | | | Fix tests on jenkins, take 2. | Deepanshu Gupta | 2015-01-07 | 1 | -4/+6 |
* | | | | | | | | | | | | | | | am 04b30fa0: am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update... | Joe Fernandez | 2015-01-08 | 1 | -25/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / / |
|
| * | | | | | | | | | | | | | | am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard fo... | Joe Fernandez | 2015-01-08 | 1 | -25/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / |
|
| | * | | | | | | | | | | | | | am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 201... | Joe Fernandez | 2015-01-07 | 1 | -25/+25 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / |
|
| | | * | | | | | | | | | | | | am d385640f: am 491a8257: docs: Update Dashboard for January 2015 | Joe Fernandez | 2015-01-07 | 1 | -25/+25 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / |
|