summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | am 492c67a8: am bd573049: Merge "Putting the gesture debugging back in the bo...Daniel Sandler2013-04-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am bd573049: Merge "Putting the gesture debugging back in the box." into jb-m...Daniel Sandler2013-04-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | am 2c5dca4a: Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not mergeThe Android Open Source Project2013-04-150-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge in jb-mr2-release history after reset to jb-mr2-devThe Android Automerger2013-04-150-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Fix keyguard pattern invalidate bugJim Miller2013-04-121-25/+22
| | | * | | | | | | | | | | | | | | | | | Ensure looper quits after all other messages are handled.Jeff Brown2013-04-112-7/+16
* | | | | | | | | | | | | | | | | | | | | am 42732e10: am 74e56f19: Merge "Public APIs for media position in RemoteCont...Jean-Michel Trivi2013-04-152-20/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" in...Jean-Michel Trivi2013-04-152-20/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | | | | | am e41c3cdb: am 7e157f32: Merge "Deprectate WebViewDatabase password methods....Ben Murdoch2013-04-152-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2...Ben Murdoch2013-04-152-3/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Merge "Deprectate WebViewDatabase password methods." into jb-mr2-devBen Murdoch2013-04-152-3/+7
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Deprectate WebViewDatabase password methods.Ben Murdoch2013-04-112-3/+7
* | | | | | | | | | | | | | | | | | | | | | am e813a85c: am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always...Andreas Huber2013-04-152-10/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExc...Andreas Huber2013-04-152-10/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | 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
| | | |/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | am baf4a057: am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() retu...Andreas Huber2013-04-151-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invali...Andreas Huber2013-04-151-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | 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
| | | |/ / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am c4294ed2: am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-devJason Sams2013-04-144-5/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-devJason Sams2013-04-144-5/+43
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "Unhide new RS APIs." into jb-mr2-devJason Sams2013-04-154-5/+43
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Unhide new RS APIs.Jason Sams2013-04-144-5/+43
* | | | | | | | | | | | | | | | | | | am 6064c5cf: am e1375908: Rename isUserLimited to isLinkedUserAmith Yamasani2013-04-132-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am e1375908: Rename isUserLimited to isLinkedUserAmith Yamasani2013-04-132-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Rename isUserLimited to isLinkedUserAmith Yamasani2013-04-132-4/+4
* | | | | | | | | | | | | | | | | | | Fix attr id update due to api change upstreamAmith Yamasani2013-04-131-1/+1
* | | | | | | | | | | | | | | | | | | am 19c95bcc: am e188c984: Merge "Introducing manifest flag requiredAccountTyp...Amith Yamasani2013-04-135-4/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr...Amith Yamasani2013-04-135-4/+26
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "Introducing manifest flag requiredAccountType" into jb-mr2-devAmith Yamasani2013-04-135-4/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Introducing manifest flag requiredAccountTypeAmith Yamasani2013-04-125-4/+26
* | | | | | | | | | | | | | | | | | | am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final ...Xavier Ducrohet2013-04-131-12/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am a068eedd: Revert "Make --non-constant-id generates non final IDs for style...Xavier Ducrohet2013-04-131-12/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Revert "Make --non-constant-id generates non final IDs for styleable."Xavier Ducrohet2013-04-131-12/+5
* | | | | | | | | | | | | | | | | | | am 00c4c670: am 301e95f2: Merge "Add a little more resource load tracing." in...Dianne Hackborn2013-04-122-5/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-devDianne Hackborn2013-04-122-5/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | Merge "Add a little more resource load tracing." into jb-mr2-devDianne Hackborn2013-04-132-5/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | Add a little more resource load tracing.Dianne Hackborn2013-04-122-5/+31
* | | | | | | | | | | | | | | | | | | | am 5141bf80: am 80fccb4d: Merge "There should be a mandatory coder\'s license...Romain Guy2013-04-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /