summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aospVladimir Marko2015-01-080-0/+0
|\
| * resolved conflicts for merge of 36401a36 to lmp-mr1-dev-plus-aospVladimir Marko2015-01-080-0/+0
| |\
| | * am e9a935f6: Merge "Check for OOM in BitmapFactory\'s getMimeTypeString()." i...Vladimir Marko2015-01-081-4/+9
| | |\
| | | * Merge "Check for OOM in BitmapFactory's getMimeTypeString()." into lmp-mr1-devVladimir Marko2015-01-081-4/+9
| | | |\
| | | | * Check for OOM in BitmapFactory's getMimeTypeString().Vladimir Marko2015-01-071-4/+9
* | | | | Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyMa...Bryce Lee2015-01-081-1/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyMa...Bryce Lee2015-01-081-1/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyMa...Bryce Lee2015-01-081-1/+3
| | |\ \ \ | | | |/ /
| | | * | Merge "Revert "GpsLocationProvider: Read data enabled status from TelephonyMa...Bryce Lee2015-01-081-1/+3
| | | |\ \
| | | | * | Revert "GpsLocationProvider: Read data enabled status from TelephonyManager."Bryce Lee2015-01-081-1/+3
* | | | | | am 62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallba...Jinsuk Kim2015-01-083-13/+66
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 62a1e753: Merge "CEC: Handle <Active Source> arriving before TvInputCallba...Jinsuk Kim2015-01-083-13/+66
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput...Jinsuk Kim2015-01-083-13/+66
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "CEC: Handle <Active Source> arriving before TvInputCallback.onAddInput...Jinsuk Kim2015-01-083-13/+66
| | | |\ \ \
| | | | * | | CEC: Handle <Active Source> arriving before TvInputCallback.onAddInputJinsuk Kim2015-01-083-13/+66
* | | | | | | am 321bf433: am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" in...Deepanshu Gupta2015-01-083-2/+68
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 2d14feb4: Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Replace java.util.LinkedHashMap.eldest()" into lmp-mr1-devDeepanshu Gupta2015-01-083-2/+68
| | | |\ \ \ \
| | | | * | | | Replace java.util.LinkedHashMap.eldest()Deepanshu Gupta2015-01-073-2/+68
* | | | | | | | am f0da92bf: am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1...Deepanshu Gupta2015-01-081-0/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 169c11dd: Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Add missing DateFormat method." into lmp-mr1-devDeepanshu Gupta2015-01-081-0/+5
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Add missing DateFormat method.Deepanshu Gupta2015-01-071-0/+5
* | | | | | | | am f45420d0: am 565b6b41: Merge "Update platform.dir search in tests." into l...Deepanshu Gupta2015-01-081-2/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-devDeepanshu Gupta2015-01-081-2/+18
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 565b6b41: Merge "Update platform.dir search in tests." into lmp-mr1-devDeepanshu Gupta2015-01-081-2/+18
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Update platform.dir search in tests." into lmp-mr1-devDeepanshu Gupta2015-01-081-2/+18
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | / / / | | | | |/ / / | | | |/| | |
| | | | * | | Update platform.dir search in tests.Deepanshu Gupta2015-01-071-2/+18
* | | | | | | am bcba2182: Merge "check ntpserver as empty string instead of null" automerg...Jeff Sharkey2015-01-081-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "check ntpserver as empty string instead of null" automerge: dbcb4a1Jeff Sharkey2015-01-081-1/+2
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge "check ntpserver as empty string instead of null"Jeff Sharkey2015-01-081-1/+2
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge "check ntpserver as empty string instead of null"Jeff Sharkey2015-01-081-1/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | check ntpserver as empty string instead of nullYoung-Ho Cha2015-01-081-1/+2
* | | | | | | | | | Merge "Add popup window accessors for anchor overlap, gravity, window"Alan Viverette2015-01-084-36/+95
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add popup window accessors for anchor overlap, gravity, windowAlan Viverette2015-01-074-36/+95
* | | | | | | | | | | Merge "API for tinting TextView compound drawables"Alan Viverette2015-01-084-150/+295
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | API for tinting TextView compound drawablesAlan Viverette2015-01-074-150/+295
* | | | | | | | | | | | am 5df729ad: am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenki...Deepanshu Gupta2015-01-081-4/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | am a98a9b30: am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." ...Deepanshu Gupta2015-01-081-4/+6
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | am d8e99c58: am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-dev ...Deepanshu Gupta2015-01-071-4/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | |
| | | * | | | | | | | | am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| | | |\ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ am 3bd33f1d: Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge "Fix tests on jenkins, take 2." into lmp-devDeepanshu Gupta2015-01-071-4/+6
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | Fix tests on jenkins, take 2.Deepanshu Gupta2015-01-071-4/+6
* | | | | | | | | | | | | | | am 04b30fa0: am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update...Joe Fernandez2015-01-081-25/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am ec5f5934: am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard fo...Joe Fernandez2015-01-081-25/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | am 97b7b863: am d385640f: am 491a8257: docs: Update Dashboard for January 201...Joe Fernandez2015-01-071-25/+25
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | am d385640f: am 491a8257: docs: Update Dashboard for January 2015Joe Fernandez2015-01-071-25/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / /