development.git - development

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge tag 'android-5.1.0_r1' into HEAD	Ricardo Cerqueira	2015-03-10	1	-1/+1
\|\
\| *	DO NOT MERGE: idegen: Skip directories named *.java when parsing source.	Sky Faber	2014-10-24	1	-1/+1
* \|	Development: Ignore directories.	Adnan	2014-11-13	1	-2/+2
* \|	Import translations. DO NOT MERGE	Baligh Uddin	2014-10-19	1	-1/+1
\|/
*	Bug 17782530: Annotations using retention policy source remain in .class	Tor Norbye	2014-10-06	2	-2/+32
*	17782530: Annotations using retention policy source remain in .class	Tor Norbye	2014-10-04	5	-24/+398
*	make_key: reduce raciness of password input	Kenny Root	2014-07-31	1	-2/+4
*	Remove deprecated locales - DO NOT MERGE	Baligh Uddin	2014-07-19	11	-88/+0
*	Import translations. DO NOT MERGE	Baligh Uddin	2014-07-06	8	-0/+64
*	Import translations. DO NOT MERGE	Baligh Uddin	2014-06-30	15	-0/+120
*	am c8ed8c25: am bcfa67e5: am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"	Ying Wang	2014-06-11	1	-2/+2
\|\
\| *	am 1e1b10ac: Merge "Switch to SDK_HOST_ARCH"	Ying Wang	2014-06-10	1	-2/+2
\| \|\
\| \| *	Switch to SDK_HOST_ARCH	Ying Wang	2014-06-09	1	-2/+2
\| \| *	DO NOT MERGE: fix package for AndroidJUnitRunner	Steve Moyer	2014-06-04	1	-1/+1
\| \| *	DO NOT MERGE: Add SmsTest and mege emulator smoke tests	Steve Moyer	2014-06-04	7	-74/+101
\| \|/
* \|	Add support for OSX to intellij-gen.sh	Evan Charlton	2014-05-20	1	-1/+5
* \|	am 311e3662: Merge "Merging emulator smoke test projects" into master-nova	Evan Charlton	2014-05-13	9	-125/+12
\|\ \
\| * \|	Merging emulator smoke test projects	Steve Moyer	2014-03-03	9	-125/+12
* \| \|	am 3b842a86: keep history after reset to master-nova-dev	Baligh Uddin	2014-05-13	9	-12/+125
\|\\| \|
* \| \|	Overhaul of intellij-gen script.	Chiao Cheng	2014-03-17	11	-748/+634
* \| \|	Merging emulator smoke test projects	Steve Moyer	2014-02-20	9	-125/+12
\|/ /
* \|	Add up to 6 10 second delays to wait for sms	Steve Moyer	2014-02-18	1	-6/+26
* \|	Adding test tag to sms test	Steve Moyer	2014-02-11	1	-2/+3
* \|	Add SMS test to verify emulator can receive sms from DDMS	Steve Moyer	2014-02-10	3	-0/+118
* \|	Remove deprecated locales	Baligh Uddin	2013-12-09	8	-64/+0
* \|	am e8ce7584: am 18e10d81: am 4a09318c: Merge "Temporarily disable elftree on ...	Ben Cheng	2013-11-23	1	-1/+1
\|\\|
\| *	am 4a09318c: Merge "Temporarily disable elftree on darwin-x86"	Ben Cheng	2013-11-22	1	-1/+1
\| \|\
\| \| *	Merge "Temporarily disable elftree on darwin-x86"	Ben Cheng	2013-11-23	1	-1/+1
\| \| \|\
\| \| \| *	Temporarily disable elftree on darwin-x86	Ben Cheng	2013-11-22	1	-1/+1
\| * \| \|	Merge commit '8eccbd3b5d90b9f0557c9a01f49d45e98ac85a46' into HEAD	The Android Open Source Project	2013-11-22	11	-90/+162
\| \|\ \ \ \| \| \|/ / \| \|/\| \|
* \| \| \|	am a163fa90: am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation...	Kenny Root	2013-11-22	1	-5/+14
\|\ \ \ \
\| * \| \| \|	am 7e0d5c29: am c9421a7a: Merge "make_key: add EC key generation support"	Kenny Root	2013-11-22	1	-5/+14
\| \|\\| \| \|
\| \| * \| \|	Merge "make_key: add EC key generation support"	Kenny Root	2013-11-22	1	-5/+14
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| \| * \|	make_key: add EC key generation support	Kenny Root	2013-11-06	1	-5/+14
* \| \| \| \|	am 23604216: am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"	Ben Cheng	2013-11-21	1	-2/+2
\|\\| \| \| \|
\| * \| \| \|	am 45d19989: am 4b60b014: Merge "Switch to use elfutils 0.153"	Ben Cheng	2013-11-21	1	-2/+2
\| \|\\| \| \| \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Switch to use elfutils 0.153	Ben Cheng	2013-11-21	1	-2/+2
\| \| \|/
* \| \|	Re-enable typedef stripping	Tor Norbye	2013-09-21	1	-1/+1
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-09-14	1	-1/+1
* \| \|	Temporarily disable removing typedefs	Tor Norbye	2013-09-12	1	-1/+1
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-09-11	1	-1/+1
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-08-28	2	-0/+16
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-08-26	8	-0/+64
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-08-21	3	-12/+12
* \| \|	Import translations. DO NOT MERGE	Baligh Uddin	2013-08-19	14	-12/+100
* \| \|	Add typedef removal tool	Tor Norbye	2013-08-13	16	-0/+591
\|/ /
* \|	Disable proguard for emulator tests	Siva Velusamy	2013-05-23	2	-0/+4
* \|	am 4889f155: am ae5b0e56: Merge "Move jdwpspy from development to dalvik (1 o...	Brian Carlstrom	2013-05-22	5	-1007/+0
\|\\|
\| *	am ae5b0e56: Merge "Move jdwpspy from development to dalvik (1 of 2)"	Brian Carlstrom	2013-05-22	5	-1007/+0
\| \|\
\| \| *	Move jdwpspy from development to dalvik (1 of 2)	Brian Carlstrom	2013-05-21	5	-1007/+0