tree 54d1c7d66098154c1d7c5bd414394ef4cf255810
parent 63f67d748682b46d58be31235a0a2d64d81b998c
parent c981c48f5bc9aefeffc0bcb0cc3934c2fae179dd
author Jim Guggemos <jimg@google.com> 1354664801 -0700
committer Jim Guggemos <jimg@google.com> 1354666118 -0700

Merge 'goog/jb-mr1.1-dev' into platform/external/eigen.

Change-Id: Ic9004531328145ea36ba513bb96a23595427f6a4