tree ce692fbd672f599211b5d7a11f6f06dfc979db81
parent 25c39b6aaf6440b4b65bbf0f9f024cff52f5f63b
parent d0b6de41f8b36df751962e28803db7a4375751ff
author Ed Tam <etam@google.com> 1428973293 -0700
committer Ed Tam <etam@google.com> 1428973293 -0700

resolved conflicts for merge of d0b6de41 to master

Change-Id: I1d1f6b1cdbd7ee441682c4258a11fb3198ca7d94