summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Revert "Separate voice and data radio technology/network type & registration ...Wink Saville2012-11-151-6/+0
* Separate voice and data radio technology/network type & registration state.Wink Saville2012-11-141-0/+6
* Merge "Remove DhcpInfoInternal"Robert Greenwalt2012-11-091-2/+2
|\
| * Remove DhcpInfoInternalRobert Greenwalt2012-11-091-2/+2
* | am fc3d4dbd: am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca1...Ed Heyl2012-11-012-8/+0
|\ \
| * \ am 6ae7e758: am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42...Ed Heyl2012-11-012-8/+0
| |\ \
| | * \ am 39912f7f: Merge commit \'87bb019e57eddcedd4aeca180ac36bdf1d42064a\' into j...Ed Heyl2012-11-012-8/+0
| | |\ \
| | | * \ Merge commit '87bb019e57eddcedd4aeca180ac36bdf1d42064a' into jb-mr1-devEd Heyl2012-11-012-8/+0
| | | |\ \
| | | | * \ Merge "Stripping dead API related to keyguard widgets" into jb-mr1-lockscreen...Adam Cohen2012-11-012-8/+0
| | | | |\ \
| | | | | * | Stripping dead API related to keyguard widgetsAdam Cohen2012-10-312-8/+0
* | | | | | | am 6ad873d4: am e730010e: am 7ab7f538: Hide new location APIs and undeprecate...Laurent Tu2012-11-012-146/+72
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e730010e: am 7ab7f538: Hide new location APIs and undeprecate old onesLaurent Tu2012-11-012-146/+72
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 7ab7f538: Hide new location APIs and undeprecate old onesLaurent Tu2012-11-012-146/+72
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Hide new location APIs and undeprecate old onesLaurent Tu2012-11-012-146/+72
| | | |/ / /
* | | | | | am aabe4bb4: am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lo...Romain Guy2012-11-012-16/+52
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | |
| * | | | am 9c0010f8: am 998d03bd: Merge "A new clock widget to create lock screen app...Romain Guy2012-11-012-16/+52
| |\ \ \ \ | | |/ / /
| | * | | am 998d03bd: Merge "A new clock widget to create lock screen appwidgets" into...Romain Guy2012-11-012-16/+52
| | |\ \ \ | | | |/ /
| | | * | A new clock widget to create lock screen appwidgetsRomain Guy2012-10-312-16/+52
| | | |/
* | | | am 46a0ec73: am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get pres...Jeff Brown2012-10-292-0/+8
|\ \ \ \ | |/ / /
| * | | am 14012e1d: am 4e0bf7c4: Merge "Add MediaRouter API to get presentation disp...Jeff Brown2012-10-292-0/+8
| |\ \ \ | | |/ /
| | * | am 4e0bf7c4: Merge "Add MediaRouter API to get presentation display." into jb...Jeff Brown2012-10-292-0/+8
| | |\ \ | | | |/
| | | * Add MediaRouter API to get presentation display.Jeff Brown2012-10-252-0/+8
* | | | am 0182dc39: am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make pr...Fabrice Di Meglio2012-10-252-4/+0
|\ \ \ \ | |/ / /
| * | | am 3b53061e: am 3e297339: Merge "FIx bug #7414801 Should make private and fin...Fabrice Di Meglio2012-10-252-4/+0
| |\ \ \ | | |/ /
| | * | am 3e297339: Merge "FIx bug #7414801 Should make private and final View.TEXT_...Fabrice Di Meglio2012-10-252-4/+0
| | |\ \ | | | |/
| | | * Merge "FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEF...Fabrice Di Meglio2012-10-252-4/+0
| | | |\
| | | | * FIx bug #7414801 Should make private and final View.TEXT_DIRECTION_DEFAULT an...Fabrice Di Meglio2012-10-252-4/+0
* | | | | am a699c1b1: am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUser...Dianne Hackborn2012-10-242-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | am 72d0a5aa: am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" ...Dianne Hackborn2012-10-242-0/+2
| |\ \ \ \ | | |/ / /
| | * | | am ead7d90e: Merge "Fix issue #7408647: Add getUserCount() API" into jb-mr1-devDianne Hackborn2012-10-242-0/+2
| | |\ \ \ | | | |/ /
| | | * | Fix issue #7408647: Add getUserCount() APIDianne Hackborn2012-10-242-0/+2
| | | |/
* | | | am 5bac2df4: am b43269ac: am 1202c436: Merge "Secure windows, secure surface ...Jeff Brown2012-10-242-0/+4
|\ \ \ \ | |/ / /
| * | | am b43269ac: am 1202c436: Merge "Secure windows, secure surface views and sec...Jeff Brown2012-10-242-0/+4
| |\ \ \ | | |/ /
| | * | am 1202c436: Merge "Secure windows, secure surface views and secure displays....Jeff Brown2012-10-242-0/+4
| | |\ \ | | | |/
| | | * Secure windows, secure surface views and secure displays.Jeff Brown2012-10-232-0/+4
* | | | am a170dcb7: am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayExce...Craig Mautner2012-10-232-2/+14
|\ \ \ \ | |/ / /
| * | | am 9e96c69e: am 6757572b: Merge "Add throwing InvalidDisplayException from ad...Craig Mautner2012-10-232-2/+14
| |\ \ \ | | |/ /
| | * | am 6757572b: Merge "Add throwing InvalidDisplayException from addView." into ...Craig Mautner2012-10-232-2/+14
| | |\ \ | | | |/
| | | * Add throwing InvalidDisplayException from addView.Craig Mautner2012-10-232-2/+14
* | | | am b1f434c1: am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores J...Dave Burke2012-10-181-2/+2
|\ \ \ \ | |/ / /
| * | | am 744b4dca: am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavio...Dave Burke2012-10-181-2/+2
| |\ \ \ | | |/ /
| | * | am 09a5321c: Merge "Revert "Revert "This restores JB MR0 behavior where the f...Dave Burke2012-10-181-2/+2
| | |\ \ | | | |/
| | | * Merge "Revert "Revert "This restores JB MR0 behavior where the framework thro...Dave Burke2012-10-181-2/+2
| | | |\
| | | | * Revert "Revert "This restores JB MR0 behavior where the framework throws an e...Dave Burke2012-10-181-2/+2
* | | | | am 4c2db5f2: am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup....Fabrice Di Meglio2012-10-181-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayout...Fabrice Di Meglio2012-10-181-1/+0
| |\ \ \ \ | | |/ / /
| | * | | am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" int...Fabrice Di Meglio2012-10-181-1/+0
| | |\ \ \ | | | |/ /
| | | * | Fix missing @hide on ViewGroup.resolveLayoutParams()Fabrice Di Meglio2012-10-181-1/+0
* | | | | am 2a902caa: am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-devFabrice Di Meglio2012-10-181-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-devFabrice Di Meglio2012-10-181-0/+1
| |\ \ \ \ | | |/ / /