3 Commits (205fb5a9062a10519b09c77512db011ee73c2b51)

Author	SHA1	Message	Date
Satoshi Kataoka	9c739939a3	Add missing res dir ... Change-Id: I50e79bbb1f2eab33c7e5a76086bbe41f7e757ada	2012-11-06 13:49:17 +09:00
Satoshi Kataoka	555e15a96a	Merge remote-tracking branch 'goog/master' into mergescriptpackage ... Conflicts: java/res/values-ca/strings.xml java/res/values-cs/strings.xml java/res/values-de/strings.xml java/res/values-es/strings.xml java/res/values-hr/strings.xml java/res/values-hu/strings.xml java/res/values-it/strings.xml java/res/values-lv/strings.xml java/res/values-nb/strings.xml java/res/values-nl/strings.xml java/res/values-pl/strings.xml java/res/values-pt/strings.xml java/res/values-ro/strings.xml java/res/values-ru/strings.xml java/res/values-sv/strings.xml java/res/values-sw/strings.xml java/res/values-tr/strings.xml java/res/values-uk/strings.xml java/res/values-zh-rCN/strings.xml java/res/values-zh-rTW/strings.xml java/src/com/android/inputmethod/latin/RichInputConnection.java Change-Id: Iba00dd5b86cb16d72968bc7e40d75853845b6dcb	2012-11-06 12:49:53 +09:00
Kurt Partridge	724bc479f7	add research log ui control ... - lets users flag a particular time in the research log - lets users delete the log for this session also makes the UsabilityLog setting control whether the ResearchLog logs or not. multi-project commit with I89067e7d3b8daca7179333f1dbe82224c26920fe Bug: 6188932 Change-Id: I89864ef3ab53b0efe1ea8d75247be08712f0c399	2012-06-06 20:42:01 -07:00