tree 5f3fabe21a06e92d94f179c4bed05de7d937b949
parent f760bcbae298d63a53c710cf8857de6174857e25
parent 62855a83b86c0b40583888f93d8b054c7d8ac99c
author Jean-Baptiste Queru <jbq@google.com> 1337199519 -0700
committer Jean-Baptiste Queru <jbq@google.com> 1337199519 -0700

resolved conflicts for merge of 62855a83 to jb-dev-plus-aosp

Change-Id: Ic424ff756396463b98d137f8353d4a230e806a07