summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | am cc9d3ec8: am bbeed672: Merge "Fix ALOG_ASSERT"John Reck2014-06-230-0/+0
|\| | | | | | |
| * | | | | | | am bbeed672: Merge "Fix ALOG_ASSERT"John Reck2014-06-231-0/+14
| |\ \ \ \ \ \ \
* | | | | | | | | am 87e32715: am e5dfefd4: am f28f92f2: am 9fec16d3: am 9d2e3059: am 5d92cc5c:...Tony Mantler2014-06-230-0/+0
|\| | | | | | | |
| * | | | | | | | am e5dfefd4: am f28f92f2: am 9fec16d3: am 9d2e3059: am 5d92cc5c: Call super.o...Tony Mantler2014-06-230-0/+0
| |\ \ \ \ \ \ \ \
* | | | | | | | | | am d9962b0c: am 6a005419: Merge "camera2: BlockingStateListener invokes proxy...Igor Murashkin2014-06-230-0/+0
|\| | | | | | | | |
| * | | | | | | | | am 6a005419: Merge "camera2: BlockingStateListener invokes proxy before firin...Igor Murashkin2014-06-231-8/+8
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | am 2bf26299: (-s ours) am f89f55d9: am c736dbcf: (-s ours) am e4dbcf35: am cf...Jay Shrauner2014-06-230-0/+0
|\| | | | | | | | | |
| * | | | | | | | | | am f89f55d9: am c736dbcf: (-s ours) am e4dbcf35: am cf4d2a64: am 38ae6989: (-...Jay Shrauner2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | am 46d0b7d2: am c5da8557: Merge "Fix AudioEngine to allow re-initialization"Jay Shrauner2014-06-230-0/+0
|\| | | | | | | | | | |
| * | | | | | | | | | | am c5da8557: Merge "Fix AudioEngine to allow re-initialization"Jay Shrauner2014-06-236-9/+33
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | am f9339af1: am 427a1270: am d06074aa: am 53e46a8c: am ae8431ea: am 79623848:...Mike Schneider2014-06-230-0/+0
|\| | | | | | | | | | | |
| * | | | | | | | | | | | am 427a1270: am d06074aa: am 53e46a8c: am ae8431ea: am 79623848: am c842713d:...Mike Schneider2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | am 979416fa: am 4b868ed8: am 27df5a3a: am 099915f7: am ebf46bcd: am 8eb56a43:...Andrew Sapperstein2014-06-230-0/+0
|\| | | | | | | | | | | | |
| * | | | | | | | | | | | | am 4b868ed8: am 27df5a3a: am 099915f7: am ebf46bcd: am 8eb56a43: am ae908d29:...Andrew Sapperstein2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | am 96145798: am 30df46f9: am 8fc3233b: am 3c154ffa: am 3696df98: am 57b5b6fa:...Kevin Lin2014-06-230-0/+0
|\| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | am 30df46f9: am 8fc3233b: am 3c154ffa: am 3696df98: am 57b5b6fa: am 0c58c370:...Kevin Lin2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | am 14321951: am 53e68fc8: am 2c2b17ec: am 15fa87c9: am af559a10: am ab307ee2:...Kevin Lin2014-06-230-0/+0
|\| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | am 53e68fc8: am 2c2b17ec: am 15fa87c9: am af559a10: am ab307ee2: am 66df41d9:...Kevin Lin2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | am 6fa46d4a: am 82ef8639: am 07c0fcd1: am 93e48b10: am 0764e983: am 4a0aacfe:...Kevin Lin2014-06-230-0/+0
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | am 82ef8639: am 07c0fcd1: am 93e48b10: am 0764e983: am 4a0aacfe: am d4ae44ec:...Kevin Lin2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | am 03491484: am a26b2617: Fix buildDir issue.Xavier Ducrohet2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | am a26b2617: Fix buildDir issue.Xavier Ducrohet2014-06-231-2/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | am 616c2b3e: (-s ours) am ef66d529: (-s ours) am 90b1744d: (-s ours) am 9a823...Baligh Uddin2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | am ef66d529: (-s ours) am 90b1744d: (-s ours) am 9a823b56: (-s ours) am 25516...Baligh Uddin2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | am af181c16: am 623648bd: am 5a32825f: am f4646b4c: am bb001e29: am 5da5d23b:...Scott Kennedy2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am 623648bd: am 5a32825f: am f4646b4c: am bb001e29: am 5da5d23b: BaseRecipien...Scott Kennedy2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | am 88249c61: am 9ea321d1: am 2a573a6a: am 56bab444: Merge "AArch64: Fix GetCh...Narayan Kamath2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am 9ea321d1: am 2a573a6a: am 56bab444: Merge "AArch64: Fix GetChannelCount() ...Narayan Kamath2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | am 346523ac: am 29ec2dc1: am 7a690375: am 9ddd5eeb: Merge "AArch64: Minor JNI...Narayan Kamath2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | am 29ec2dc1: am 7a690375: am 9ddd5eeb: Merge "AArch64: Minor JNI type changes"Narayan Kamath2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | am ef5af8f4: am 9f78e2bd: am 1ceba204: am 868fffca: am ae07c2be: Fix director...Scott Kennedy2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | am 9f78e2bd: am 1ceba204: am 868fffca: am ae07c2be: Fix directory lookupsScott Kennedy2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | am 161ddf55: am 9f85468d: am 2b2a375a: am 8f046ac9: am 95fedd51: Change to sc...Kevin Lin2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | am 9f85468d: am 2b2a375a: am 8f046ac9: am 95fedd51: Change to scrollToBottomV...Kevin Lin2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | am 7ebfa6e1: am 6f33043a: am 6396ce03: am 58228018: am a75fa12d: Fix chips li...Kevin Lin2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | am 6f33043a: am 6396ce03: am 58228018: am a75fa12d: Fix chips library bugs re...Kevin Lin2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | am c198947d: am b65711a4: am 37ac47d3: am 01801599: am a3daacb2: Handle malfo...Chris Craik2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | am b65711a4: am 37ac47d3: am 01801599: am a3daacb2: Handle malformed gif stre...Chris Craik2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | am 26342585: am 11e4f6f1: Resolve tag conflict between exp_det_snet and gmail...William Luh2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | am 11e4f6f1: Resolve tag conflict between exp_det_snet and gmail_perf_end.William Luh2014-06-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | am f1ef5227: am 70235389: Rename exp_det_snet tag to snet.William Luh2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | am 70235389: Rename exp_det_snet tag to snet.William Luh2014-06-231-1/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 1caf6b66: (-s ours) am c845eeac: (-s ours) Merge "Import translations. DO ...Baligh Uddin2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | am c845eeac: (-s ours) Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am a16318ac: am 0b05bf59: Fix gradle\'s buildDirXavier Ducrohet2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 0b05bf59: Fix gradle\'s buildDirXavier Ducrohet2014-06-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 8cc76769: am 63d66d16: Disable break on lint error.Xavier Ducrohet2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 63d66d16: Disable break on lint error.Xavier Ducrohet2014-06-231-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 3750c6ea: am b0550328: am 6e247616: am a799ac06: am 26b19245: am 7b83246c:...Scott Kennedy2014-06-230-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am b0550328: am 6e247616: am a799ac06: am 26b19245: am 7b83246c: Build agains...Scott Kennedy2014-06-230-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \