commit | b69f058b8ad6c955fb307b8f496f9d02f065a0be | [log] [tgz] |
---|---|---|
author | Stephen Hines <srhines@google.com> | Thu Aug 27 10:50:37 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 10:50:37 2015 +0000 |
tree | ebd4d739215332e242fa5cba88f95c0791873d42 | |
parent | e2125d253087e13e7d1622df036876828ba7b099 [diff] | |
parent | f1d9400e270b4117761c71526ed539796316d73a [diff] |
am f1d9400e: (-s ours) am cfcac8c2: am 2f011b0f: Merge "Fix a broken test due to RS header file updates." * commit 'f1d9400e270b4117761c71526ed539796316d73a':