summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | am edf2ab16: am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80:...Dirk Dougherty2013-04-1521-83/+1217
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am b345693f: am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: ...Dirk Dougherty2013-04-1521-83/+1217
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am 5a9c5b67: am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy gu...Dirk Dougherty2013-04-1521-83/+1217
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | am b02d529a: am 6859939f: am 99a79e80: Doc change: add policy guidelines docu...Dirk Dougherty2013-04-1521-83/+1217
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | am 6859939f: am 99a79e80: Doc change: add policy guidelines documents.Dirk Dougherty2013-04-1521-83/+1217
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | am 99a79e80: Doc change: add policy guidelines documents.Dirk Dougherty2013-04-1521-83/+1217
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|/ / / / / / | | | | | | |/| | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | Doc change: add policy guidelines documents.Dirk Dougherty2013-04-1221-83/+1217
* | | | | | | | | | | | | | | | | | | Merge "keystore: remove old APIs" into jb-mr2-devKenny Root2013-04-151-24/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | keystore: remove old APIsKenny Root2013-04-121-24/+0
* | | | | | | | | | | | | | | | | | | Merge "Crash on non-eng builds due to lacking null check." into jb-mr2-devSvetoslav2013-04-151-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Crash on non-eng builds due to lacking null check.Svetoslav2013-04-151-1/+3
* | | | | | | | | | | | | | | | | | | | Merge "Fully setup newly bound service before state management." into jb-mr2-devSvetoslav2013-04-151-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Fully setup newly bound service before state management.Svetoslav2013-04-151-3/+5
* | | | | | | | | | | | | | | | | | | | Merge "Draw Operation merging" into jb-mr2-devChris Craik2013-04-1512-176/+627
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Draw Operation mergingChris Craik2013-04-1512-176/+627
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Enabling Face Unlock for user switching (bug 8495282)" into jb-mr2-devBrian Colonna2013-04-153-4/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Enabling Face Unlock for user switching (bug 8495282)Brian Colonna2013-04-153-4/+22
* | | | | | | | | | | | | | | | | | | | Merge "Allow non-system apps to use restricted accounts" into jb-mr2-devAmith Yamasani2013-04-152-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Allow non-system apps to use restricted accountsAmith Yamasani2013-04-152-6/+7
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Clarify how release of offline keys is handled in the MediaDrm API" in...Jeff Tinker2013-04-151-14/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Clarify how release of offline keys is handled in the MediaDrm APIJeff Tinker2013-04-121-14/+21
* | | | | | | | | | | | | | | | | | | Merge "Remove old KeyStore call sites" into jb-mr2-devKenny Root2013-04-153-122/+180
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Remove old KeyStore call sitesKenny Root2013-04-123-122/+180
* | | | | | | | | | | | | | | | | | | Merge "Revert GC thread changes" into jb-mr2-devJason Sams2013-04-155-99/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Revert GC thread changesJason Sams2013-04-145-99/+2
* | | | | | | | | | | | | | | | | | | | Merge "Import translations. DO NOT MERGE" into jb-mr2-devBaligh Uddin2013-04-153-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-04-153-11/+11
| | |_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "fix javadoc build" into jb-mr2-devScott Main2013-04-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | fix javadoc buildScott Main2013-04-151-2/+2
| | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | am 80f8c84e: am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add o...Scott Main2013-04-151-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 0451003f: am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaom...Scott Main2013-04-151-0/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver link...Scott Main2013-04-151-0/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 852314...Scott Main2013-04-151-0/+7
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr...Scott Main2013-04-151-0/+7
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docsScott Main2013-04-151-0/+7
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | | add oppo and xiaomi driver linksScott Main2013-04-111-0/+7
* | | | | | | | | | | | | | | | | | | | Merge "Putting the gesture debugging back in the box." into jb-mr2-devDaniel Sandler2013-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Putting the gesture debugging back in the box.Daniel Sandler2013-04-111-1/+1
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-devJean-Michel Trivi2013-04-152-20/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Public APIs for media position in RemoteControlClientJean-Michel Trivi2013-04-142-20/+21
* | | | | | | | | | | | | | | | | | | Merge "Deprectate WebViewDatabase password methods." into jb-mr2-devBen Murdoch2013-04-152-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Deprectate WebViewDatabase password methods.Ben Murdoch2013-04-112-3/+7
* | | | | | | | | | | | | | | | | | | | Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from"...Andreas Huber2013-04-152-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | MediaExtractor.setDataSource(...) has always thrown IOExceptions fromAndreas Huber2013-04-112-10/+11
| |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)"...Andreas Huber2013-04-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Document that MediaPlayer.getDuration() returns an invalid value (-1)Andreas Huber2013-04-111-1/+2
| |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge "Unhide new RS APIs." into jb-mr2-devJason Sams2013-04-154-5/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Unhide new RS APIs.Jason Sams2013-04-144-5/+43
* | | | | | | | | | | | | | | | | | | Rename isUserLimited to isLinkedUserAmith Yamasani2013-04-132-4/+4
* | | | | | | | | | | | | | | | | | | Merge "Introducing manifest flag requiredAccountType" into jb-mr2-devAmith Yamasani2013-04-135-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |