summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "fix argument mismatches in Paint JNI"Victoria Lease2013-02-152-6/+6
|\
| * fix argument mismatches in Paint JNIVictoria Lease2013-02-142-6/+6
* | Merge "Add support for shadows in TextAppearance styles"Adam Powell2013-02-152-6/+43
|\ \
| * | Add support for shadows in TextAppearance stylesAdam Powell2013-02-142-6/+43
* | | Merge "Remove throttle settings, no longer needed."Jeff Sharkey2013-02-151-51/+0
|\ \ \
| * | | Remove throttle settings, no longer needed.Jeff Sharkey2013-02-141-51/+0
* | | | Merge "Expose longer statfs values, add derived values."Jeff Sharkey2013-02-142-0/+56
|\ \ \ \ | |/ / /
| * | | Expose longer statfs values, add derived values.Jeff Sharkey2013-02-132-0/+56
* | | | Surface doens't have an identity anymoreMathias Agopian2013-02-141-1/+1
* | | | fix docs buildMathias Agopian2013-02-141-1/+1
* | | | Merge "Reset and reuse Iterators and don't new() one."Craig Mautner2013-02-143-99/+149
|\ \ \ \ | |_|/ / |/| | |
| * | | Reset and reuse Iterators and don't new() one.Craig Mautner2013-02-143-99/+149
* | | | am dc7b3e3b: am 9657ba0e: Merge "KeyStore: stop using state()"Kenny Root2013-02-145-9/+10
|\ \ \ \
| * \ \ \ am 9657ba0e: Merge "KeyStore: stop using state()"Kenny Root2013-02-145-9/+10
| |\ \ \ \
| | * \ \ \ Merge "KeyStore: stop using state()"Kenny Root2013-02-145-9/+10
| | |\ \ \ \
| | | * | | | KeyStore: stop using state()Kenny Root2013-02-145-9/+10
| | |/ / / /
* | | | | | Merge "split Surface in two classes: SurfaceControl and Surface"Mathias Agopian2013-02-1430-1338/+1393
|\ \ \ \ \ \
| * | | | | | split Surface in two classes: SurfaceControl and SurfaceMathias Agopian2013-02-1430-1338/+1393
* | | | | | | Merge "get rid of Surface.getIdentity()"Mathias Agopian2013-02-142-18/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | get rid of Surface.getIdentity()Mathias Agopian2013-02-132-18/+1
* | | | | | | am f16de3f3: am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: ...Dirk Dougherty2013-02-142-2/+22
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | am 0f4a378d: am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice fo...Dirk Dougherty2013-02-142-2/+22
| |\ \ \ \ \
| | * \ \ \ \ am da9ac596: am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subs...Dirk Dougherty2013-02-142-2/+22
| | |\ \ \ \ \
| | | * \ \ \ \ am 9a93e079: am f857c51d: Doc change: add notice for iab v3 subscriptions lau...Dirk Dougherty2013-02-142-2/+22
| | | |\ \ \ \ \
| | | | * \ \ \ \ am f857c51d: Doc change: add notice for iab v3 subscriptions launch.Dirk Dougherty2013-02-142-2/+22
| | | | |\ \ \ \ \
| | | | | * | | | | Doc change: add notice for iab v3 subscriptions launch.Dirk Dougherty2013-02-142-2/+22
* | | | | | | | | | Merge "Remove AppWindowToken lists."Craig Mautner2013-02-143-105/+31
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove AppWindowToken lists.Craig Mautner2013-02-143-105/+31
* | | | | | | | | | | Merge "Adjust captive portal test for setup wizard"Russell Brenner2013-02-143-14/+74
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Adjust captive portal test for setup wizardRussell Brenner2013-02-143-14/+74
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge "Implement support for drawBitmapMesh's colors array"Romain Guy2013-02-149-27/+136
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement support for drawBitmapMesh's colors arrayRomain Guy2013-02-139-27/+136
* | | | | | | | | | | Merge "Fix build."Craig Mautner2013-02-141-31/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix build.Craig Mautner2013-02-141-31/+1
| | |/ / / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge "Remove unused App methods."Craig Mautner2013-02-145-338/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove unused App methods.Craig Mautner2013-02-135-338/+0
* | | | | | | | | | | Merge "Fix a permissions probem in ConnectivityManager"Robert Greenwalt2013-02-141-1/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix a permissions probem in ConnectivityManagerRobert Greenwalt2013-02-121-1/+7
* | | | | | | | | | | | Merge "Refactor setAppOpVisibility implementation."Craig Mautner2013-02-142-19/+10
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Refactor setAppOpVisibility implementation.Craig Mautner2013-02-122-19/+10
* | | | | | | | | | | | | Merge "Convert live preview demo to IO_OUTPUT"Jason Sams2013-02-144-39/+102
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Convert live preview demo to IO_OUTPUTJason Sams2013-02-134-39/+102
* | | | | | | | | | | | | | Merge "Remove sscanf() warnings when parsing stats."Jeff Sharkey2013-02-141-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Remove sscanf() warnings when parsing stats.Jeff Sharkey2013-02-131-2/+2
* | | | | | | | | | | | | | Merge "Parse network stats using native code."Jeff Sharkey2013-02-148-31/+341
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Parse network stats using native code.Jeff Sharkey2013-02-138-31/+341
* | | | | | | | | | | | | | Merge "More debug logs for stuck statusbars."Daniel Sandler2013-02-142-26/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | More debug logs for stuck statusbars.Daniel Sandler2013-02-132-26/+34
* | | | | | | | | | | | | | Merge "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"Fabrice Di Meglio2013-02-141-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKeyFabrice Di Meglio2013-02-131-10/+10
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |