tree ac84b0930f4e7f469c43b5afa306deccdfab13a4
parent 2b2c31f603b2dd5a9740e7cf14d926892ec267df
parent a7d01a75190abbb4b3f47d15c86421bd19c11fc2
author Adam Powell <adamp@google.com> 1307495760 -0700
committer Adam Powell <adamp@google.com> 1307495760 -0700

resolved conflicts for merge of a7d01a75 to master

Change-Id: Ib6a7bbca7711cb5e35085868c4b9b5cbb9b526a4