summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global"...Xia Wang2012-09-261-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix Wifi Stress test after wifi settings are moved to Settings.globalXia Wang2012-09-261-7/+8
| | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docsScott Main2012-09-261-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docsScott Main2012-09-261-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am ed5ff3bd: add analog clock attributes to docsScott Main2012-09-261-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | add analog clock attributes to docsScott Main2012-09-261-0/+4
* | | | | | | | | | | | | | Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-devXavier Ducrohet2012-09-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | am 16eb5366: am 54645245: am 14a36625: fix markup bugsScott Main2012-09-261-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | am 54645245: am 14a36625: fix markup bugsScott Main2012-09-261-3/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | am 14a36625: fix markup bugsScott Main2012-09-261-3/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | fix markup bugsScott Main2012-09-261-3/+2
| | | | |_|/ / / / / / / / | | | |/| | | | | | | | |
* | | | | | | | | | | | | Merge "Applies a layer's color filter even when the layer is a quad Bug #7238...Romain Guy2012-09-261-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Applies a layer's color filter even when the layer is a quadRomain Guy2012-09-261-5/+5
* | | | | | | | | | | | | Merge "Dream metadata now specified using an xml-resource." into jb-mr1-devJohn Spurlock2012-09-263-18/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Dream metadata now specified using an xml-resource.John Spurlock2012-09-263-18/+23
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge "Assign default texture id of 0" into jb-mr1-devChet Haase2012-09-265-15/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Assign default texture id of 0Chet Haase2012-09-265-15/+13
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
* | | | | | | | | | | | | am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs...Xavier Ducrohet2012-09-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | / / / / / / / | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | am 6c6ddbff: Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix writing text version of styleable IDs. do not merge.Xavier Ducrohet2012-09-261-1/+1
* | | | | | | | | | | | Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-devGlenn Kasten2012-09-263-2/+29
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Implement android.media.AudioManager.getProperty()Glenn Kasten2012-09-253-2/+29
* | | | | | | | | | | | Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-devVictoria Lease2012-09-261-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | getBestProvider() prefers GPS over NLPVictoria Lease2012-09-241-3/+3
* | | | | | | | | | | | Enable multi-user function for IMFSatoshi Kataoka2012-09-261-135/+402
* | | | | | | | | | | | Merge "LockScreen: only set keystore password for owner" into jb-mr1-devKenny Root2012-09-251-4/+13
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | LockScreen: only set keystore password for ownerKenny Root2012-09-251-4/+13
* | | | | | | | | | | | | Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-devDave Burke2012-09-251-16/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Remove WifiStateTracker code tracking wifi p2pIrfan Sheriff2012-09-251-16/+1
* | | | | | | | | | | | | | fix a possible dead-lock when clearing cachesMathias Agopian2012-09-251-9/+17
* | | | | | | | | | | | | | Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-devDave Burke2012-09-252-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | make sure to destroy GL objects on the GL threadMathias Agopian2012-09-252-3/+2
* | | | | | | | | | | | | | | Merge "Remove permission check in registerAdapter" into jb-mr1-devMatthew Xie2012-09-251-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Remove permission check in registerAdapterMatthew Xie2012-09-251-2/+0
* | | | | | | | | | | | | | | Merge "Revert "Deleting objects on the wrong thread is a silly idea Bug #7195...Dave Burke2012-09-255-11/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815"Dave Burke2012-09-255-11/+25
* | | | | | | | | | | | | | | | Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" ...Adam Powell2012-09-251-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Further tweak touchMajor/Minor stabilization in ScaleGestureDetectorAdam Powell2012-09-251-2/+3
* | | | | | | | | | | | | | | | | am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for...Scott Main2012-09-251-11/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout stateScott Main2012-09-251-11/+16
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am 3b1c5d55: add tip about including android:id for layout stateScott Main2012-09-251-11/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | add tip about including android:id for layout stateScott Main2012-09-251-11/+16
* | | | | | | | | | | | | | | | | Merge "Use more reasonable warning thresholds for power on/off." into jb-mr1-devJeff Brown2012-09-251-6/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Use more reasonable warning thresholds for power on/off.Jeff Brown2012-09-251-6/+6
| | |_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | am c80188eb: am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idec...Joe Fernandez2012-09-250-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1...Joe Fernandez2012-09-250-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61...Joe Fernandez2012-09-250-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7Joe Fernandez2012-09-257-0/+478
* | | | | | | | | | | | | | | | | Merge "Handle multi-user mountObb() requests." into jb-mr1-devJeff Sharkey2012-09-2511-162/+273
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | |