| Commit message (Expand) | Author | Age | Files | Lines |
* | am 97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the ... | Igor Murashkin | 2014-06-04 | 1 | -7/+7 |
|\ |
|
| * | Merge "camera2: Change CaptureListener callbacks to include the session (api)... | Igor Murashkin | 2014-06-04 | 1 | -7/+7 |
| |\ |
|
| | * | camera2: Change CaptureListener callbacks to include the session (api) | Igor Murashkin | 2014-06-04 | 1 | -7/+7 |
| * | | DO NOT MERGE Redact SyncService stuff from master | Matthew Williams | 2014-06-04 | 1 | -18/+0 |
| |/ |
|
* | | am 37532379: Merge "DNG: Hide unimplemented methods." into lmp-preview-dev | Ruben Brunk | 2014-06-04 | 1 | -7/+0 |
|\ \
| |/ |
|
| * | Merge "DNG: Hide unimplemented methods." into lmp-preview-dev | Ruben Brunk | 2014-06-04 | 1 | -7/+0 |
| |\ |
|
| | * | DNG: Hide unimplemented methods. | Ruben Brunk | 2014-06-04 | 1 | -7/+0 |
| * | | Hide TrustAgentService in lmp-preview - DO NOT MERGE | Adrian Roos | 2014-06-04 | 1 | -15/+0 |
| |/ |
|
* | | Merge "Redact SyncService stuff from master" | Matthew Williams | 2014-06-04 | 1 | -18/+0 |
|\ \ |
|
| * | | Redact SyncService stuff from master | Matthew Williams | 2014-06-04 | 1 | -18/+0 |
* | | | am 1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-dev | Alan Viverette | 2014-06-04 | 1 | -135/+136 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix action bar menu inflation context | Alan Viverette | 2014-06-03 | 1 | -135/+136 |
* | | | Merge commit '096d52fb' into manualmerge | Alan Viverette | 2014-06-04 | 1 | -625/+52 |
|\ \ \
| |/ /
| | /
| |/
|/| |
|
| * | Merge "Update theme colors, fix EditText state transition" into lmp-preview-dev | Alan Viverette | 2014-06-03 | 1 | -38/+37 |
| |\ |
|
| | * | Update theme colors, fix EditText state transition | Alan Viverette | 2014-06-03 | 1 | -38/+37 |
| * | | Merge "Revert sendEnvelope changes [DO NOT MERGE]" into lmp-preview-dev | Evan Charlton | 2014-06-03 | 1 | -5/+0 |
| |\ \
| | |/
| |/| |
|
| | * | Revert sendEnvelope changes [DO NOT MERGE] | Evan Charlton | 2014-05-29 | 1 | -5/+0 |
* | | | Merge "Ignore inPurgeable and inInputShareable." | Leon Scroggins III | 2014-06-04 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | Ignore inPurgeable and inInputShareable. | Leon Scroggins III | 2014-06-03 | 1 | -2/+2 |
* | | | | Merge "Remove enableSystemApp() and enableSystemAppWithInten()." | Sander Alewijnse | 2014-06-04 | 1 | -2/+0 |
|\ \ \ \ |
|
| * | | | | Remove enableSystemApp() and enableSystemAppWithInten(). | Sander Alewijnse | 2014-05-27 | 1 | -2/+0 |
* | | | | | Add missing #isSpeaking to TTS API V2 | Przemyslaw Szczepaniak | 2014-06-04 | 1 | -0/+1 |
* | | | | | am 594ac157: Merge "TvContract: Address the feedback from the API review" int... | Jae Seo | 2014-06-03 | 1 | -12/+28 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Merge "TvContract: Address the feedback from the API review" into lmp-preview... | Jae Seo | 2014-06-03 | 1 | -12/+28 |
| |\ \ \ \ |
|
| | * | | | | TvContract: Address the feedback from the API review | Jae Seo | 2014-06-02 | 1 | -12/+28 |
* | | | | | | am b9c0a8ae: Merge "Add a way to get the class name of SetupActivity and Sett... | Chulwoo Lee | 2014-06-03 | 1 | -1/+5 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Add a way to get the class name of SetupActivity and SettingsActivity"... | Chulwoo Lee | 2014-06-02 | 1 | -1/+5 |
| |\ \ \ \ \ |
|
| | * | | | | | Add a way to get the class name of SetupActivity and SettingsActivity | Chulwoo Lee | 2014-06-03 | 1 | -1/+5 |
| | |/ / / / |
|
* | | | | | | am 25931ade: Merge "Clean up drawable theming APIs" into lmp-preview-dev | Alan Viverette | 2014-06-03 | 1 | -7/+2 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Clean up drawable theming APIs" into lmp-preview-dev | Alan Viverette | 2014-06-02 | 1 | -7/+2 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | Clean up drawable theming APIs | Alan Viverette | 2014-06-02 | 1 | -7/+2 |
* | | | | | | Merge "Adding user consent extras to DevicePolicyManager." | Nicolas Prevot | 2014-06-03 | 1 | -0/+1 |
|\ \ \ \ \ \ |
|
| * | | | | | | Adding user consent extras to DevicePolicyManager. | Nicolas Prevot | 2014-06-03 | 1 | -0/+1 |
| | |_|_|/ /
| |/| | | | |
|
* | | | | | | resolved conflicts for merge of ebe661c4 to master | Jae Seo | 2014-06-03 | 1 | -154/+154 |
|\ \ \ \ \ \
| |/ / / / /
|/| / / / /
| |/ / / / |
|
| * | | | | Merge "Put TV Input Framework under android.media.tv, including TvContract" i... | Jae Seo | 2014-06-02 | 1 | -154/+154 |
| |\ \ \ \ |
|
| | * | | | | Put TV Input Framework under android.media.tv, including TvContract | Jae Seo | 2014-06-02 | 1 | -154/+154 |
| | |/ / / |
|
| * | | | | Merge "DO NOT MERGE: Accomoditing API Review feedback for WifiScanner" into l... | Vinit Deshpande | 2014-06-02 | 1 | -80/+0 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | DO NOT MERGE: Accomoditing API Review feedback for WifiScanner | Vinit Deshpande | 2014-05-30 | 1 | -80/+0 |
* | | | | | Fix build | Alan Viverette | 2014-06-01 | 1 | -1/+1 |
* | | | | | Merge commit '6682183b' into manualmerge | Alan Viverette | 2014-06-01 | 1 | -0/+2 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Fixes hotspot list transitions, update to use a single hotspot | Alan Viverette | 2014-06-01 | 1 | -0/+2 |
* | | | | | Restrictions Manager | Amith Yamasani | 2014-05-31 | 1 | -0/+31 |
* | | | | | Allow ConnectionService to ask Telecomm for ringback | Ihab Awad | 2014-05-31 | 1 | -0/+6 |
* | | | | | am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev | Dianne Hackborn | 2014-05-31 | 1 | -2/+9 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Merge "Clean up voice API." into lmp-preview-dev | Dianne Hackborn | 2014-05-30 | 1 | -2/+9 |
| |\ \ \ \ |
|
| | * | | | | Clean up voice API. | Dianne Hackborn | 2014-05-30 | 1 | -2/+9 |
* | | | | | | am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-... | Jeff Sharkey | 2014-05-30 | 1 | -0/+3 |
|\ \ \ \ \ \
| |/ / / / / |
|
| * | | | | | Merge "Per-app media directories on external storage." into lmp-preview-dev | Jeff Sharkey | 2014-05-30 | 1 | -0/+3 |
| |\ \ \ \ \ |
|
| | * | | | | | Per-app media directories on external storage. | Jeff Sharkey | 2014-05-30 | 1 | -0/+3 |
* | | | | | | | am 338382de: Merge "Fix action bar title TextAppearance usage for Toolbar dec... | Adam Powell | 2014-05-30 | 1 | -0/+2 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|