Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | * | | | | | | | | | | | | am c0677691: am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver link... | Scott Main | 2013-04-15 | 1 | -0/+7 | |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ | am 92fd5508: am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 852314... | Scott Main | 2013-04-15 | 1 | -0/+7 | |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ | am c70e0f5e: Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr... | Scott Main | 2013-04-15 | 1 | -0/+7 | |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge "add oppo and xiaomi driver links bug: 8523141" into jb-mr1.1-docs | Scott Main | 2013-04-15 | 1 | -0/+7 | |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | | | | | | * | | | | | | | | | | | | add oppo and xiaomi driver links | Scott Main | 2013-04-11 | 1 | -0/+7 | |
* | | | | | | | | | | | | | | | | | | | | am 492c67a8: am bd573049: Merge "Putting the gesture debugging back in the bo... | Daniel Sandler | 2013-04-15 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am bd573049: Merge "Putting the gesture debugging back in the box." into jb-m... | Daniel Sandler | 2013-04-15 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Putting the gesture debugging back in the box." into jb-mr2-dev | Daniel Sandler | 2013-04-15 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | Putting the gesture debugging back in the box. | Daniel Sandler | 2013-04-11 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | am 2c5dca4a: Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-04-15 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | Reconcile with jb-mr2-release - do not merge | The Android Open Source Project | 2013-04-15 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | merge in jb-mr2-release history after reset to jb-mr2-dev | The Android Automerger | 2013-04-15 | 0 | -0/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | Fix keyguard pattern invalidate bug | Jim Miller | 2013-04-12 | 1 | -25/+22 | |
| | | * | | | | | | | | | | | | | | | | | | Ensure looper quits after all other messages are handled. | Jeff Brown | 2013-04-11 | 2 | -7/+16 | |
* | | | | | | | | | | | | | | | | | | | | | am 42732e10: am 74e56f19: Merge "Public APIs for media position in RemoteCont... | Jean-Michel Trivi | 2013-04-15 | 2 | -20/+21 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | am 74e56f19: Merge "Public APIs for media position in RemoteControlClient" in... | Jean-Michel Trivi | 2013-04-15 | 2 | -20/+21 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge "Public APIs for media position in RemoteControlClient" into jb-mr2-dev | Jean-Michel Trivi | 2013-04-15 | 2 | -20/+21 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | Public APIs for media position in RemoteControlClient | Jean-Michel Trivi | 2013-04-14 | 2 | -20/+21 | |
* | | | | | | | | | | | | | | | | | | | | | am e41c3cdb: am 7e157f32: Merge "Deprectate WebViewDatabase password methods.... | Ben Murdoch | 2013-04-15 | 2 | -3/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | am 7e157f32: Merge "Deprectate WebViewDatabase password methods." into jb-mr2... | Ben Murdoch | 2013-04-15 | 2 | -3/+7 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge "Deprectate WebViewDatabase password methods." into jb-mr2-dev | Ben Murdoch | 2013-04-15 | 2 | -3/+7 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | Deprectate WebViewDatabase password methods. | Ben Murdoch | 2013-04-11 | 2 | -3/+7 | |
* | | | | | | | | | | | | | | | | | | | | | | am e813a85c: am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always... | Andreas Huber | 2013-04-15 | 2 | -10/+11 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | am 2de0771d: Merge "MediaExtractor.setDataSource(...) has always thrown IOExc... | Andreas Huber | 2013-04-15 | 2 | -10/+11 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | | Merge "MediaExtractor.setDataSource(...) has always thrown IOExceptions from"... | Andreas Huber | 2013-04-15 | 2 | -10/+11 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | | | MediaExtractor.setDataSource(...) has always thrown IOExceptions from | Andreas Huber | 2013-04-11 | 2 | -10/+11 | |
| | | |/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | am baf4a057: am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() retu... | Andreas Huber | 2013-04-15 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | am 5c5c3f3a: Merge "Document that MediaPlayer.getDuration() returns an invali... | Andreas Huber | 2013-04-15 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | | Merge "Document that MediaPlayer.getDuration() returns an invalid value (-1)"... | Andreas Huber | 2013-04-15 | 1 | -1/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | | | Document that MediaPlayer.getDuration() returns an invalid value (-1) | Andreas Huber | 2013-04-11 | 1 | -1/+2 | |
| | | |/ / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | am c4294ed2: am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev | Jason Sams | 2013-04-14 | 4 | -5/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | am 330a9fe3: Merge "Unhide new RS APIs." into jb-mr2-dev | Jason Sams | 2013-04-14 | 4 | -5/+43 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Unhide new RS APIs." into jb-mr2-dev | Jason Sams | 2013-04-15 | 4 | -5/+43 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | |/| | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | Unhide new RS APIs. | Jason Sams | 2013-04-14 | 4 | -5/+43 | |
* | | | | | | | | | | | | | | | | | | | am 6064c5cf: am e1375908: Rename isUserLimited to isLinkedUser | Amith Yamasani | 2013-04-13 | 2 | -4/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am e1375908: Rename isUserLimited to isLinkedUser | Amith Yamasani | 2013-04-13 | 2 | -4/+4 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Rename isUserLimited to isLinkedUser | Amith Yamasani | 2013-04-13 | 2 | -4/+4 | |
* | | | | | | | | | | | | | | | | | | | Fix attr id update due to api change upstream | Amith Yamasani | 2013-04-13 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | am 19c95bcc: am e188c984: Merge "Introducing manifest flag requiredAccountTyp... | Amith Yamasani | 2013-04-13 | 5 | -4/+26 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am e188c984: Merge "Introducing manifest flag requiredAccountType" into jb-mr... | Amith Yamasani | 2013-04-13 | 5 | -4/+26 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Introducing manifest flag requiredAccountType" into jb-mr2-dev | Amith Yamasani | 2013-04-13 | 5 | -4/+26 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | ||||||
| | | * | | | | | | | | | | | | | | | | Introducing manifest flag requiredAccountType | Amith Yamasani | 2013-04-12 | 5 | -4/+26 | |
* | | | | | | | | | | | | | | | | | | | am ade20f49: am a068eedd: Revert "Make --non-constant-id generates non final ... | Xavier Ducrohet | 2013-04-13 | 1 | -12/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am a068eedd: Revert "Make --non-constant-id generates non final IDs for style... | Xavier Ducrohet | 2013-04-13 | 1 | -12/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Revert "Make --non-constant-id generates non final IDs for styleable." | Xavier Ducrohet | 2013-04-13 | 1 | -12/+5 | |
* | | | | | | | | | | | | | | | | | | | am 00c4c670: am 301e95f2: Merge "Add a little more resource load tracing." in... | Dianne Hackborn | 2013-04-12 | 2 | -5/+31 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | am 301e95f2: Merge "Add a little more resource load tracing." into jb-mr2-dev | Dianne Hackborn | 2013-04-12 | 2 | -5/+31 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | Merge "Add a little more resource load tracing." into jb-mr2-dev | Dianne Hackborn | 2013-04-13 | 2 | -5/+31 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | Add a little more resource load tracing. | Dianne Hackborn | 2013-04-12 | 2 | -5/+31 | |
* | | | | | | | | | | | | | | | | | | | | am 5141bf80: am 80fccb4d: Merge "There should be a mandatory coder\'s license... | Romain Guy | 2013-04-12 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |