tree c992baefc7e136d81ec5788238f2e9a54a94e1cb
parent 86e6edc9f6faa35d841c684286450bc70d190c27
parent 7a7aad0a012e738c58d1444f1669887bee16eb2a
author Trevor Johns <trevorjohns@google.com> 1383165114 -0700
committer Trevor Johns <trevorjohns@google.com> 1383165114 -0700

Merge downstream branch 'developers-dev' into 'klp-dev'

Consolidating changes from topic branch for release.