4 Commits

Author	SHA1	Message	Date
Andrey Kamaev	af912f4843	Merged the trunk r8901:8904	2012-07-02 13:46:47 +00:00
Andrey Kamaev	088a6597bc	Merged the trunk 8855,8885,8886	2012-07-02 12:05:06 +00:00
Marina Kolpakova	162f9fd7ea	merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811	2012-06-28 17:07:17 +00:00
Marina Kolpakova	01570fa800	merged Android Manager and new java layout	2012-06-28 16:23:19 +00:00