| commit | 06cef47628879a4ea61dfd66d81f8c8921bf6e1c | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <edheyl@google.com> | Sun Apr 26 22:01:44 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sun Apr 26 22:01:44 2015 +0000 |
| tree | b74aa191ac219c45a56f93a9e56a4d76bd396e4f | |
| parent | 131fc14e7f61d37209d8e437fb460f3f2ca6d663 [diff] | |
| parent | ecae9a0a08c98b0d226b333b7fe67ec2dc00206e [diff] |
am ecae9a0a: (-s ours) am 95cf5683: (-s ours) merge in release branch changes (no-op). * commit 'ecae9a0a08c98b0d226b333b7fe67ec2dc00206e':