| commit | 0e4aa8db3fcbe91cbbe76db291424fb271b7749c | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri May 30 04:05:29 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 30 04:05:29 2014 +0000 |
| tree | e1d0539cc81e58413692db01d40091c873af8b89 | |
| parent | 62e2ff00e4cbdda32777af8f9addf1fb70421c3a [diff] | |
| parent | 79e7c0a98e0ffd5af09dac4d6ab7a7449b93b472 [diff] |
am 79e7c0a9: Merge remote-tracking branch \'goog/master\' into merge-from-master * commit '79e7c0a98e0ffd5af09dac4d6ab7a7449b93b472':