summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* am 83a61421: am bbd90f8e: Merge "Hide isLinkedUser()" into jb-mr2-devAmith Yamasani2013-04-251-1/+0
|\
| * Merge "Hide isLinkedUser()" into jb-mr2-devAmith Yamasani2013-04-261-1/+0
| |\
| | * Hide isLinkedUser()Amith Yamasani2013-04-251-1/+0
* | | am 56f7afb0: am cc165d16: Merge "Fix build." into jb-mr2-devDaniel Sandler2013-04-251-1/+1
|\ \ \ | |/ /
| * | Merge "Fix build." into jb-mr2-devDaniel Sandler2013-04-251-1/+1
| |\ \
| | * | Fix build.Daniel Sandler2013-04-251-1/+1
* | | | am 4064af9b: am a7b6cbf1: Merge "API cleanup: NotificationListener" into jb-m...Daniel Sandler2013-04-251-8/+7
|\ \ \ \ | |/ / /
| * | | Merge "API cleanup: NotificationListener" into jb-mr2-devDaniel Sandler2013-04-251-8/+7
| |\ \ \ | | |/ / | | | / | | |/ | |/|
| | * API cleanup: NotificationListenerDaniel Sandler2013-04-251-8/+7
* | | am fa1c4430: am 5e97c317: Merge "New NotificationListener API: getActiveNotif...Daniel Sandler2013-04-251-0/+1
|\ \ \ | |/ /
| * | Merge "New NotificationListener API: getActiveNotifications()" into jb-mr2-devDaniel Sandler2013-04-251-0/+1
| |\ \ | | |/
| | * New NotificationListener API: getActiveNotifications()Daniel Sandler2013-04-241-0/+1
* | | am 269c068d: am df181185: Merge "Hide TYPE_CHOICE_LEVEL since there\'s no vis...Amith Yamasani2013-04-251-1/+0
|\ \ \ | |/ /
| * | Hide TYPE_CHOICE_LEVEL since there's no visual representation for it yet.Amith Yamasani2013-04-241-1/+0
| |/
* | am 2e0a94d2: am b442d074: Merge "Add hardware feature android.hardware.blueto...Matthew Xie2013-04-231-0/+1
|\ \ | |/
| * Merge "Add hardware feature android.hardware.bluetooth.le" into jb-mr2-devMatthew Xie2013-04-231-0/+1
| |\
| | * Add hardware feature android.hardware.bluetooth.leMatthew Xie2013-04-231-0/+1
| * | Adding matching @deprecated.Ian Rogers2013-04-231-1/+1
* | | am 896ee5b6: am be4536d2: Merge "Adding matching @deprecated."Ian Rogers2013-04-231-1/+1
|\ \ \
| * \ \ am be4536d2: Merge "Adding matching @deprecated."Ian Rogers2013-04-231-1/+1
| |\ \ \ | | |/ / | |/| |
| | * | Adding matching @deprecated.Ian Rogers2013-04-191-1/+1
| | * | Fix build.Elliott Hughes2013-03-181-2/+2
* | | | am 7bf02d12: am a61464d7: Merge "Making new node id APIs return strings." int...Svetoslav2013-04-231-2/+2
|\ \ \ \ | |/ / /
| * | | Merge "Making new node id APIs return strings." into jb-mr2-devSvetoslav2013-04-231-2/+2
| |\ \ \
| | * | | Making new node id APIs return strings.Svetoslav2013-04-221-2/+2
* | | | | resolved conflicts for merge of 8c3cb811 to masterDianne Hackborn2013-04-231-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | JB MR2 == API 18.Dianne Hackborn2013-04-221-1/+1
| |/ / /
* | | | am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bi...Fabrice Di Meglio2013-04-201-43/+22
|\ \ \ \ | |/ / /
| * | | Fix bug #8656546 API REVIEW: android.text.bidi / android.textFabrice Di Meglio2013-04-191-43/+22
* | | | am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify ...Jeff Tinker2013-04-191-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Correct algorithm property name and clarify javadoc description of dev...Jeff Tinker2013-04-191-1/+1
| |\ \ \
| | * | | Correct algorithm property name and clarify javadoc description ofJeff Tinker2013-04-191-1/+1
* | | | | am dd240d9a: am 0935f258: Merge "Updating API based on feedback" into jb-mr2-devJason Sams2013-04-191-12/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Updating API based on feedback" into jb-mr2-devJason Sams2013-04-191-12/+0
| |\ \ \ \
| | * | | | Updating API based on feedbackJason Sams2013-04-191-12/+0
* | | | | | am ba567014: am e37c8f78: Merge "Improve API and documentation" into jb-mr2-devAmith Yamasani2013-04-191-1/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Improve API and documentation" into jb-mr2-devAmith Yamasani2013-04-191-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Improve API and documentationAmith Yamasani2013-04-191-1/+2
* | | | | | am dde9559b: am 24b55f25: Merge "Deprecate StatFs methods returning small val...Jeff Sharkey2013-04-191-4/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Deprecate StatFs methods returning small values." into jb-mr2-devJeff Sharkey2013-04-191-4/+5
| |\ \ \ \ \
| | * | | | | Deprecate StatFs methods returning small values.Jeff Sharkey2013-04-191-4/+5
| | | |/ / / | | |/| | |
* | | | | | am 78017d2e: am eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-devKenny Root2013-04-191-31/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Rename API AndroidKey* -> Key*" into jb-mr2-devKenny Root2013-04-191-31/+31
| |\ \ \ \ \
| | * | | | | Rename API AndroidKey* -> Key*Kenny Root2013-04-181-31/+31
* | | | | | | am 68757ef6: am 63e550f2: Merge "Add getters and private constructor" into jb...Irfan Sheriff2013-04-191-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Add getters and private constructor" into jb-mr2-devIrfan Sheriff2013-04-191-2/+3
| |\ \ \ \ \ \
| | * | | | | | Add getters and private constructorIrfan Sheriff2013-04-191-2/+3
* | | | | | | | am 696b15e5: am 68711f93: Merge "Revert "Simple MVC based binding mechanism f...Philip Milne2013-04-191-33/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Revert "Simple MVC based binding mechanism for android controls."" int...Philip Milne2013-04-191-33/+3
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| | * | | | | | Revert "Simple MVC based binding mechanism for android controls."Philip Milne2013-04-181-33/+3
| | | |_|/ / / | | |/| | | |