tree 5039b7e41a12cca898056ecf2bb650acf00639b5
parent 4d4bd3ac83911647e429f48724ce8a65fa38c4a8
parent 594e64af533e969f9c83be8c17f46ed9f6903cf2
author Jean-Baptiste Queru <jbq@google.com> 1330357520 -0800
committer Jean-Baptiste Queru <jbq@google.com> 1330357520 -0800

resolved conflicts for merge of 594e64af to master

Change-Id: I940b7a1d409fed99a58dd79f2b9620f4c5bc3d92