| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | | | | | | | | | | | Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global"... | Xia Wang | 2012-09-26 | 1 | -7/+8 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|_|_|_|_|_|_|_|/ / /
|/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Fix Wifi Stress test after wifi settings are moved to Settings.global | Xia Wang | 2012-09-26 | 1 | -7/+8 |
| | |_|_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | am 3cda8467: am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs | Scott Main | 2012-09-26 | 1 | -0/+4 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 8bf95ee6: am ed5ff3bd: add analog clock attributes to docs | Scott Main | 2012-09-26 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am ed5ff3bd: add analog clock attributes to docs | Scott Main | 2012-09-26 | 1 | -0/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | add analog clock attributes to docs | Scott Main | 2012-09-26 | 1 | -0/+4 |
* | | | | | | | | | | | | | | Merge "Fix writing text version of styleable IDs. do not merge." into jb-mr1-dev | Xavier Ducrohet | 2012-09-26 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | Fix writing text version of styleable IDs. do not merge. | Xavier Ducrohet | 2012-09-26 | 1 | -1/+1 |
| | |_|_|/ / / / / / / / / /
| |/| | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | am 16eb5366: am 54645245: am 14a36625: fix markup bugs | Scott Main | 2012-09-26 | 1 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / /
| |/| | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | am 54645245: am 14a36625: fix markup bugs | Scott Main | 2012-09-26 | 1 | -3/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / /
| | |/| | | | | | | | | | | |
|
| | * | | | | | | | | | | | | am 14a36625: fix markup bugs | Scott Main | 2012-09-26 | 1 | -3/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / /
| | | |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | | fix markup bugs | Scott Main | 2012-09-26 | 1 | -3/+2 |
| | | | |_|/ / / / / / / /
| | | |/| | | | | | | | | |
|
* | | | | | | | | | | | | | Merge "Applies a layer's color filter even when the layer is a quad Bug #7238... | Romain Guy | 2012-09-26 | 1 | -5/+5 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|/ / / / / /
| |/| | | | | | | | | | | |
|
| * | | | | | | | | | | | | Applies a layer's color filter even when the layer is a quad | Romain Guy | 2012-09-26 | 1 | -5/+5 |
* | | | | | | | | | | | | | Merge "Dream metadata now specified using an xml-resource." into jb-mr1-dev | John Spurlock | 2012-09-26 | 3 | -18/+23 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Dream metadata now specified using an xml-resource. | John Spurlock | 2012-09-26 | 3 | -18/+23 |
| |/ / / / / / / / / / / / |
|
* | | | | | | | | | | | | | Merge "Assign default texture id of 0" into jb-mr1-dev | Chet Haase | 2012-09-26 | 5 | -15/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Assign default texture id of 0 | Chet Haase | 2012-09-26 | 5 | -15/+13 |
| | |_|_|_|_|_|_|_|_|_|_|/
| |/| | | | | | | | | | | |
|
* | | | | | | | | | | | | | am 4649d03b: (-s ours) am 6c6ddbff: Fix writing text version of styleable IDs... | Xavier Ducrohet | 2012-09-26 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|/ / / / / / / / / /
| |/| | | | / / / / / / /
| |_|_|_|_|/ / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | am 6c6ddbff: Fix writing text version of styleable IDs. do not merge. | Xavier Ducrohet | 2012-09-26 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \
| | | |_|/ / / / / / / /
| | |/| | | | | | | | | |
|
| | * | | | | | | | | | | Fix writing text version of styleable IDs. do not merge. | Xavier Ducrohet | 2012-09-26 | 1 | -1/+1 |
* | | | | | | | | | | | | Merge "Implement android.media.AudioManager.getProperty()" into jb-mr1-dev | Glenn Kasten | 2012-09-26 | 3 | -2/+29 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | Implement android.media.AudioManager.getProperty() | Glenn Kasten | 2012-09-25 | 3 | -2/+29 |
* | | | | | | | | | | | | Merge "getBestProvider() prefers GPS over NLP" into jb-mr1-dev | Victoria Lease | 2012-09-26 | 1 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|/ / / / / / / /
|/| | | | | | | | | | | |
|
| * | | | | | | | | | | | getBestProvider() prefers GPS over NLP | Victoria Lease | 2012-09-24 | 1 | -3/+3 |
* | | | | | | | | | | | | Enable multi-user function for IMF | Satoshi Kataoka | 2012-09-26 | 1 | -135/+402 |
* | | | | | | | | | | | | Merge "LockScreen: only set keystore password for owner" into jb-mr1-dev | Kenny Root | 2012-09-25 | 1 | -4/+13 |
|\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | LockScreen: only set keystore password for owner | Kenny Root | 2012-09-25 | 1 | -4/+13 |
* | | | | | | | | | | | | | Merge "Remove WifiStateTracker code tracking wifi p2p" into jb-mr1-dev | Dave Burke | 2012-09-25 | 1 | -16/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Remove WifiStateTracker code tracking wifi p2p | Irfan Sheriff | 2012-09-25 | 1 | -16/+1 |
* | | | | | | | | | | | | | | fix a possible dead-lock when clearing caches | Mathias Agopian | 2012-09-25 | 1 | -9/+17 |
* | | | | | | | | | | | | | | Merge "make sure to destroy GL objects on the GL thread" into jb-mr1-dev | Dave Burke | 2012-09-25 | 2 | -3/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | make sure to destroy GL objects on the GL thread | Mathias Agopian | 2012-09-25 | 2 | -3/+2 |
* | | | | | | | | | | | | | | | Merge "Remove permission check in registerAdapter" into jb-mr1-dev | Matthew Xie | 2012-09-25 | 1 | -2/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |/ / / / / / / / / / / / / /
|/| | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | Remove permission check in registerAdapter | Matthew Xie | 2012-09-25 | 1 | -2/+0 |
* | | | | | | | | | | | | | | | Merge "Revert "Deleting objects on the wrong thread is a silly idea Bug #7195... | Dave Burke | 2012-09-25 | 5 | -11/+25 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | Revert "Deleting objects on the wrong thread is a silly idea Bug #7195815" | Dave Burke | 2012-09-25 | 5 | -11/+25 |
* | | | | | | | | | | | | | | | | Merge "Further tweak touchMajor/Minor stabilization in ScaleGestureDetector" ... | Adam Powell | 2012-09-25 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | Further tweak touchMajor/Minor stabilization in ScaleGestureDetector | Adam Powell | 2012-09-25 | 1 | -2/+3 |
* | | | | | | | | | | | | | | | | | am 82e7fdfd: am 4f832bc7: am 3b1c5d55: add tip about including android:id for... | Scott Main | 2012-09-25 | 1 | -11/+16 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|/ / / / / / / / /
| |/| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | am 4f832bc7: am 3b1c5d55: add tip about including android:id for layout state | Scott Main | 2012-09-25 | 1 | -11/+16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |_|_|_|_|_|_|/ / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | am 3b1c5d55: add tip about including android:id for layout state | Scott Main | 2012-09-25 | 1 | -11/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |_|_|_|_|_|_|/ / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | add tip about including android:id for layout state | Scott Main | 2012-09-25 | 1 | -11/+16 |
* | | | | | | | | | | | | | | | | | Merge "Use more reasonable warning thresholds for power on/off." into jb-mr1-dev | Jeff Brown | 2012-09-25 | 1 | -6/+6 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | | | | | Use more reasonable warning thresholds for power on/off. | Jeff Brown | 2012-09-25 | 1 | -6/+6 |
| | |_|_|_|_|_|_|_|_|_|_|/ / / / /
| |/| | | | | | | | | | | | | | | |
|
* | | | | | | | | | | | | | | | | | am c80188eb: am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idec... | Joe Fernandez | 2012-09-25 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |/ / / / / / / / / / / / / / /
| |/| | | | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | | | | am 9b516383: am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1... | Joe Fernandez | 2012-09-25 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | |/ / / / / / / / / / / / / /
| | |/| | | | | | | | | | | | | | |
|
| | * | | | | | | | | | | | | | | | am e35d9280: cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61... | Joe Fernandez | 2012-09-25 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | |/ / / / / / / / / / / / /
| | | |/| | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | cherrypick from jb-dev Change-Id: Idecee238d8872ca1c32a80d13ad61bacf89c39f7 | Joe Fernandez | 2012-09-25 | 7 | -0/+478 |
* | | | | | | | | | | | | | | | | | Merge "Handle multi-user mountObb() requests." into jb-mr1-dev | Jeff Sharkey | 2012-09-25 | 11 | -162/+273 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|_|_|/ / / / / / / / / / / /
|/| | | | | | | | | | | | | | | | |
|