summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am 2f9fd33f: am e8c01ddb: Merge "Changes to PFD based on API review" into klp...Amith Yamasani2013-09-181-2/+6
|\
| * Merge "Changes to PFD based on API review" into klp-devAmith Yamasani2013-09-181-2/+6
| |\
| | * Changes to PFD based on API reviewAmith Yamasani2013-09-181-2/+6
* | | am 6d0db04b: am 7b3990ec: Merge "Update the print dialog." into klp-devSvetoslav2013-09-181-1/+1
|\ \ \ | |/ /
| * | Merge "Update the print dialog." into klp-devSvetoslav2013-09-181-1/+1
| |\ \
| | * | Update the print dialog.Svetoslav2013-09-181-1/+3
* | | | am 954f0d7b: am ba1abbba: Merge "Revert "Revert "Take the input device into a...Raph Levien2013-09-181-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "Revert "Revert "Take the input device into account for meta state""" i...Raph Levien2013-09-181-0/+2
| |\ \ \
| | * | | Revert "Revert "Take the input device into account for meta state""Raph Levien2013-09-181-0/+2
* | | | | resolved conflicts for merge of 1995a7de to masterKenny Root2013-09-181-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Finish issue #10779747: Calendar Storage crash observed..." into klp-devDianne Hackborn2013-09-181-0/+3
| |\ \ \ \
| | * | | | Finish issue #10779747: Calendar Storage crash observed...Dianne Hackborn2013-09-181-0/+3
* | | | | | am faebc647: am bd49a1da: Merge "Change case of "keyset" to "keySet" for mani...Kenny Root2013-09-181-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Change case of "keyset" to "keySet" for manifests" into klp-devKenny Root2013-09-181-1/+1
| |\ \ \ \ \
| | * | | | | Change case of "keyset" to "keySet" for manifestsKenny Root2013-09-181-1/+1
* | | | | | | am 21b0c88b: am c540f8e9: Merge "Revert "Take the input device into account f...Raph Levien2013-09-181-2/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Revert "Take the input device into account for meta state"" into klp-devRaph Levien2013-09-181-2/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | / / | | |_|_|/ / | |/| | | |
| | * | | | Revert "Take the input device into account for meta state"Raph Levien2013-09-181-2/+0
* | | | | | am b7bdf38b: am 01fc0884: Merge "Update APIs for the Chromium WebView" into k...Jonathan Dixon2013-09-181-10/+11
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Update APIs for the Chromium WebView" into klp-devJonathan Dixon2013-09-181-10/+11
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Update APIs for the Chromium WebViewJonathan Dixon2013-09-171-10/+11
| | | |_|/ | | |/| |
* | | | | am 0fe0fe95: am b8462457: Merge "Misc. media API changes" into klp-devLajos Molnar2013-09-181-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Misc. media API changes" into klp-devLajos Molnar2013-09-181-2/+2
| |\ \ \ \
| | * | | | Misc. media API changesLajos Molnar2013-09-171-2/+2
* | | | | | am e3d75c9d: am e23ce3b1: Merge "Add CaptioningManager listener Subtitle supp...Lajos Molnar2013-09-181-0/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add CaptioningManager listener Subtitle support." into klp-devLajos Molnar2013-09-181-0/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add CaptioningManager listener Subtitle support.Lajos Molnar2013-09-171-0/+3
* | | | | | am 2bf68f43: am 904aa38f: Merge "Try fixing the build again" into klp-devJustin Mattson2013-09-171-1/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Try fixing the build againJustin Mattson2013-09-171-1/+0
* | | | | | am 2fed38ec: am 09804e41: Merge "Add isQuickScaleEnabled to ScaleGestureDetec...Mindy Pereira2013-09-171-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add isQuickScaleEnabled to ScaleGestureDetector" into klp-devMindy Pereira2013-09-171-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add isQuickScaleEnabled to ScaleGestureDetectorMindy Pereira2013-09-171-0/+1
| | | |_|/ | | |/| |
* | | | | am 144835ae: am f03ceff2: Merge "Revise new public API for ratings in RemoteC...Jean-Michel Trivi2013-09-171-16/+45
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Revise new public API for ratings in RemoteControlClient" into klp-devJean-Michel Trivi2013-09-171-16/+45
| |\ \ \ \
| | * | | | Revise new public API for ratings in RemoteControlClientJean-Michel Trivi2013-09-171-16/+45
* | | | | | am 10d44a76: am a245a4f1: Merge "Update the APIs to fix the build" into klp-devSvetoslav2013-09-171-0/+42
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Update the APIs to fix the buildSvetoslav2013-09-171-0/+42
* | | | | | Merge "Fix default style attr in DialogPreference subclass constructors"Alan Viverette2013-09-171-2/+3
|\ \ \ \ \ \
| * | | | | | Fix default style attr in DialogPreference subclass constructorsAlan Viverette2013-09-161-2/+3
* | | | | | | am deae1e11: am b00e5cc6: Merge "Add permissions for the InCallUI Split." int...Santos Cordon2013-09-171-0/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Add permissions for the InCallUI Split." into klp-devSantos Cordon2013-09-171-0/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | Add permissions for the InCallUI Split.Santos Cordon2013-09-121-0/+1
* | | | | | | am eded3b50: am 2a07bde6: Merge "Public API for LoudnessEnhancer audio effect...Jean-Michel Trivi2013-09-171-0/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Public API for LoudnessEnhancer audio effect" into klp-devJean-Michel Trivi2013-09-171-0/+6
| |\ \ \ \ \ \
| | * | | | | | Public API for LoudnessEnhancer audio effectJean-Michel Trivi2013-09-161-0/+6
* | | | | | | | am 6484c42e: am 33caca5c: Merge "Add a feature to specify if device admins ar...Amith Yamasani2013-09-171-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Add a feature to specify if device admins are supported on the device"...Amith Yamasani2013-09-171-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Add a feature to specify if device admins are supported on the deviceAmith Yamasani2013-09-161-0/+1
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | am e7d34086: am be0d9317: Merge "App UI freezes when printing. API clean up."...Svetoslav2013-09-161-4/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | App UI freezes when printing. API clean up.Svetoslav2013-09-161-4/+10
| | |/ / / / / | |/| | | | |