summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | am aef98356: am 9fc8356b: Merge "Add potential future APIs for postmessage"Selim Gurun2015-03-024-0/+184
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am 9fc8356b: Merge "Add potential future APIs for postmessage"Selim Gurun2015-03-024-0/+184
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge "Add potential future APIs for postmessage"Selim Gurun2015-03-024-0/+184
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Add potential future APIs for postmessageSelim Gurun2015-03-024-0/+184
* | | | | | | | | | | | | | | | | | | | | am 06e9147d: am c8e3784e: am 20a5df62: am bcced5b8: Merge "Fix incorrect cond...Shishir Agrawal2015-03-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am c8e3784e: am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub...Shishir Agrawal2015-03-021-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | am 20a5df62: am bcced5b8: Merge "Fix incorrect condition for sub id check." i...Shishir Agrawal2015-03-021-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | am bcced5b8: Merge "Fix incorrect condition for sub id check." into lmp-mr1-devShishir Agrawal2015-03-021-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge "Fix incorrect condition for sub id check." into lmp-mr1-devShishir Agrawal2015-03-021-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | Fix incorrect condition for sub id check.Junda Liu2015-02-231-1/+1
* | | | | | | | | | | | | | | | | | | | | am 70775bed: am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d:...Deepanshu Gupta2015-03-022-517/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | am fb96187b: am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Corre...Deepanshu Gupta2015-03-022-517/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | am 32dc37b7: am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff...Deepanshu Gupta2015-03-022-517/+37
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | am f2c1c096: am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." in...Deepanshu Gupta2015-03-022-517/+37
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | am 6ed9b75a: am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | am 72d75f8d: Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|_|_|/ / / / / / / | | | | | | |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | Merge "Correct PorterDuff filters." into lmp-devDeepanshu Gupta2015-03-022-517/+37
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | | * | | | | | | | | | | | | | | Correct PorterDuff filters.Deepanshu Gupta2015-02-262-517/+37
* | | | | | | | | | | | | | | | | | | | | | am 6e64fabe: am 7c4ab9de: am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b:...Deepanshu Gupta2015-03-021-1/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am 7c4ab9de: am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix c...Deepanshu Gupta2015-03-021-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am 4e87709b: am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for ...Deepanshu Gupta2015-03-021-1/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | am 2022b0ff: am d003e813: am 369ad57b: Merge "Fix codestyle for switch statem...Deepanshu Gupta2015-03-021-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | am d003e813: am 369ad57b: Merge "Fix codestyle for switch statements." into l...Deepanshu Gupta2015-03-021-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | am 369ad57b: Merge "Fix codestyle for switch statements." into lmp-devDeepanshu Gupta2015-03-021-1/+0
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | Merge "Fix codestyle for switch statements." into lmp-devDeepanshu Gupta2015-03-021-1/+0
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | | | | Fix codestyle for switch statements.Deepanshu Gupta2015-02-261-1/+0
* | | | | | | | | | | | | | | | | | | | | | am 1fe1022d: am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am 10d620ff:...Deepanshu Gupta2015-03-021-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am 4a194d3b: am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Bette...Deepanshu Gupta2015-03-021-3/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am 62500307: am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg f...Deepanshu Gupta2015-03-021-3/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | am aff0ec93: am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/...Deepanshu Gupta2015-03-021-3/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | am 81449b2c: am 10d620ff: Merge "Better error msg for StateList/Hexadecimal C...Deepanshu Gupta2015-03-021-3/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | am 10d620ff: Merge "Better error msg for StateList/Hexadecimal Color." into l...Deepanshu Gupta2015-03-021-3/+13
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | Merge "Better error msg for StateList/Hexadecimal Color." into lmp-devDeepanshu Gupta2015-03-021-3/+13
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | | | | Better error msg for StateList/Hexadecimal Color.Deepanshu Gupta2015-02-231-3/+13
* | | | | | | | | | | | | | | | | | | | | | am c74295db: am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar tim...Deepanshu Gupta2015-03-021-2/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | am bf815f49: am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" in...Deepanshu Gupta2015-03-021-2/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | am 7b4caab1: am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-devDeepanshu Gupta2015-03-021-2/+5
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | am 07d453fa: Merge "Add status bar time for 5.1" into lmp-mr1-devDeepanshu Gupta2015-03-021-2/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | Merge "Add status bar time for 5.1" into lmp-mr1-devDeepanshu Gupta2015-03-021-2/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | Add status bar time for 5.1Deepanshu Gupta2015-02-261-2/+5
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix crash in UndoManager after parceling TextView"James Cook2015-03-022-0/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Fix crash in UndoManager after parceling TextViewJames Cook2015-03-022-0/+14
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Improve handling of activity destroy during popup exit animation"Alan Viverette2015-03-021-3/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Improve handling of activity destroy during popup exit animationAlan Viverette2015-03-021-3/+9
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix issue where pruned UsageStats files would not be removed from index"Adam Lesinski2015-03-021-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Fix issue where pruned UsageStats files would not be removed from indexAdam Lesinski2015-03-021-12/+17
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Add generic "INTERACTION" event type to UsageStatsManager"Adam Lesinski2015-03-028-1/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | / / / / / / / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Add generic "INTERACTION" event type to UsageStatsManagerAdam Lesinski2015-03-028-1/+55
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Remove unused imports in frameworks/base."John Spurlock2015-03-02348-706/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | Remove unused imports in frameworks/base.John Spurlock2015-02-28348-706/+0
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |