| commit | 9920fe138a6136cc622efdb27611a21ce78e9ba9 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Wed Apr 30 01:00:06 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 01:00:06 2014 +0000 |
| tree | 487c48ae62b827ff9ae9850c9cbbd3c43e0667e7 | |
| parent | ccd553eadab529e985357739cab584da2f6c3d33 [diff] | |
| parent | 546495ea490265757a92ced911261a9ff8a3a472 [diff] |
am 546495ea: Merge commit \'f051e503b3ecdff0e20734d919cc259b528faae9\' into HEAD * commit '546495ea490265757a92ced911261a9ff8a3a472':